Fixes #2406 (#2410)

simonharrer · tobiasdiez · commit fc31851315c9 · 2016-12-20T17:27:50.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - The integrity check now determines the set of BibLaTeX-only fields differently. Fixes [#2390](https://github.com/JabRef/jabref/issues/2390).
 - We fixed an issue where groups containing brackets were not working properly. Fixes [#2394](https://github.com/JabRef/jabref/issues/2394).
 - We fixed issues with the [timestamp](http://help.jabref.org/en/TimeStamp) field. Today and clear work again. Fixes [#2403](https://github.com/JabRef/jabref/issues/2403).
+- Fixes [#2406](https://github.com/JabRef/jabref/issues/2406) so that the integrity check filter works again
 
 ### Removed
 
diff --git a/src/main/java/net/sf/jabref/logic/integrity/BibtexkeyDeviationChecker.java b/src/main/java/net/sf/jabref/logic/integrity/BibtexkeyDeviationChecker.java
@@ -36,7 +36,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         if (!Objects.equals(key, generatedKey)) {
             return Collections.singletonList(new IntegrityMessage(
-                    Localization.lang("BibTeX key %0 deviates from generated key %1", key, generatedKey), entry, BibEntry.KEY_FIELD));
+                    Localization.lang("BibTeX key deviates from generated key"), entry, BibEntry.KEY_FIELD));
         }
 
         return Collections.emptyList();
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=Dateiverzeichnis-Pattern
 Update_with_bibliographic_information_from_the_web=Aktualisiere_mit_bibliographischen_Information_aus_dem_Internet
 
 Could_not_find_any_bibliographic_information.=Keine_bibliographischen_Informationen_gefunden.
-BibTeX_key_%0_deviates_from_generated_key_%1=BibTeX-Key_%0_weicht_vom_generierten_Key_%1_ab
+BibTeX_key_deviates_from_generated_key=BibTeX-Key_weicht_vom_generierten_Key_ab
 DOI_%0_is_invalid=DOI_%0_ist_ungültig
 
 Select_all_customized_types_to_be_stored_in_local_preferences=Wählen_Sie_alle_angepassten_Eintragstypen,_die_in_den_lokalen_Einstellungen_gespeichert_werden_sollen
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=File_directory_pattern
 Update_with_bibliographic_information_from_the_web=Update_with_bibliographic_information_from_the_web
 
 Could_not_find_any_bibliographic_information.=Could_not_find_any_bibliographic_information.
-BibTeX_key_%0_deviates_from_generated_key_%1=BibTeX_key_%0_deviates_from_generated_key_%1
+BibTeX_key_deviates_from_generated_key=BibTeX_key_deviates_from_generated_key
 DOI_%0_is_invalid=DOI_%0_is_invalid
 
 Select_all_customized_types_to_be_stored_in_local_preferences=Select_all_customized_types_to_be_stored_in_local_preferences
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=Modèle_de_répertoire_de_fichiers
 Update_with_bibliographic_information_from_the_web=Mettre_à_jour_avec_les_informations_bibliographiques_trouvées_sur_le_web
 
 Could_not_find_any_bibliographic_information.=Aucune_information_bibliographique_n'a_été_trouvée.
-BibTeX_key_%0_deviates_from_generated_key_%1=La_clef_BibTeX_%0_diffère_de_la_clef_%1_générée
+BibTeX_key_deviates_from_generated_key=La_clef_BibTeX_diffère_de_la_clef_générée
 DOI_%0_is_invalid=Le_DOI_%0_est_invalide
 
 Select_all_customized_types_to_be_stored_in_local_preferences=Sélectionner_tous_les_types_personnalisés_pour_les_stocker_dans_les_préférences_locales
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=Modello_della_cartella_dei_file
 Update_with_bibliographic_information_from_the_web=Aggiorna_con_informazioni_bibliografiche_dal_web
 
 Could_not_find_any_bibliographic_information.=Non_ho_trovato_informazioni_bibliografiche.
-BibTeX_key_%0_deviates_from_generated_key_%1=Chiave_BibTeX_%0_diversa_dalla_chiave_generata_%1
+BibTeX_key_deviates_from_generated_key=Chiave_BibTeX_diversa_dalla_chiave_generata
 DOI_%0_is_invalid=DOI_%0_non_valido
 
 Select_all_customized_types_to_be_stored_in_local_preferences=Seleziona_tutti_i_tipi_personalizzati_da_registrare_nelle_preferenze_locali
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=ファイルディレクトリのパターン
 Update_with_bibliographic_information_from_the_web=ウェブからの文献情報を使用して更新
 
 Could_not_find_any_bibliographic_information.=文献情報を見つけることができませんでした。
-BibTeX_key_%0_deviates_from_generated_key_%1=BibTeX鍵%0は生成された鍵%1と異なります
+BibTeX_key_deviates_from_generated_key=BibTeX鍵は生成された鍵と異なります
 DOI_%0_is_invalid=DOI_%0は有効ではありません
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
@@ -2314,7 +2314,7 @@ File_directory_pattern=
 Update_with_bibliographic_information_from_the_web=
 
 Could_not_find_any_bibliographic_information.=
-BibTeX_key_%0_deviates_from_generated_key_%1=
+BibTeX_key_deviates_from_generated_key=
 DOI_%0_is_invalid=
 
 Select_all_customized_types_to_be_stored_in_local_preferences=

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public List<IntegrityMessage> check(BibEntry entry) {`
`36`	`36`
`37`	`37`	`if (!Objects.equals(key, generatedKey)) {`
`38`	`38`	`return Collections.singletonList(new IntegrityMessage(`
`39`		`- Localization.lang("BibTeX key %0 deviates from generated key %1", key, generatedKey), entry, BibEntry.KEY_FIELD));`
	`39`	`+ Localization.lang("BibTeX key deviates from generated key"), entry, BibEntry.KEY_FIELD));`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`return Collections.emptyList();`