Skip to content

Commit

Permalink
Tests could not be executed as two menu items with the same name exis…
Browse files Browse the repository at this point in the history
…ted.
  • Loading branch information
simonharrer committed Mar 15, 2016
1 parent 91f2a74 commit 8ed2a60
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/integrationTest/java/net/sf/jabref/gui/GUITest.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void testCreateBibtexEntry() {

newDatabase(mainFrame);

mainFrame.menuItemWithPath("BibTeX", "New entry").click();
mainFrame.menuItemWithPath("BibTeX", "New entry...").click();

This comment has been minimized.

Copy link
@koppor

koppor Mar 15, 2016

Member

I don't get, why this works. Menu_da.properties doesn't show New_entry..., does it?

This comment has been minimized.

Copy link
@simonharrer

simonharrer Mar 15, 2016

Author Contributor

Magic :)

Having ... for a menu item should not be part of the localization. And it is not in that case.

This comment has been minimized.

Copy link
@matthiasgeiger

matthiasgeiger Mar 15, 2016

Member

Because this is only the UI test.
In the code the dots are simply appended:
putValue(Action.NAME, Localization.menuTitle("New entry") + "..."); (See NewEntryAction.java)

This comment has been minimized.

Copy link
@koppor

koppor Mar 15, 2016

Member

I think, it is irritating if the entry in Menu_*.properties is different from the code. In the case of New entry by type..., the dots are contained in Menu_*.properties, which I fully agree with.

findDialog(EntryTypeDialog.class).withTimeout(10_000).using(robot()).button(new GenericTypeMatcher<JButton>(JButton.class) {

@Override protected boolean isMatching(@Nonnull JButton jButton) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jabref/gui/JabRefFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ private void fillMenu() {
JMenu view = JabRefFrame.subMenu(Localization.menuTitle("View"));
JMenu tools = JabRefFrame.subMenu(Localization.menuTitle("Tools"));
JMenu options = JabRefFrame.subMenu(Localization.menuTitle("Options"));
JMenu newSpec = JabRefFrame.subMenu(Localization.menuTitle("New entry..."));
JMenu newSpec = JabRefFrame.subMenu(Localization.menuTitle("New entry by type..."));
JMenu helpMenu = JabRefFrame.subMenu(Localization.menuTitle("Help"));

file.add(newBibtexDatabaseAction);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_da.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Manage_journal_abbreviations=&Administrer_tidsskriftsforkortelser
Mark_entries=&M\u00e6rk_poster
New_database=&Ny_database
New_entry=N&y_post
New_entry...=&Ny_post...
New_entry_by_type...=&Ny_post...
New_entry_from_plain_text=Ny_&post_fra_ren_tekst
New_subdatabase_based_on_AUX_file=Ny_deldatabase_baseret_p\u00e5_AU&X-fil
Next_tab=&N\u00e6ste_faneblad
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ New_database=&Neue_Datei
# Menu BibTeX (BibTeX)
New_entry=&Neuer_Eintrag

New_entry...=Neuer_&Eintrag...
New_entry_by_type...=Neuer_&Eintrag...

New_entry_from_plain_text=Neuer_Eintrag_aus_&Klartext

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ New_database=&New_database
New_%0_database=&New_%0_database
# Menu BibTeX (BibTeX)
New_entry=N&ew_entry
New_entry...=&New_entry...
New_entry_by_type...=&New_entry_by_type...
New_entry_from_plain_text=Ne&w_entry_from_plain_text
New_subdatabase_based_on_AUX_file=New_subdatabase_based_on_AU&X_file
# View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Mark_entries=&Marcar_registros
New_database=&Nueva_base_de_datos
#_Menu_BibTeX_(BibTeX)
New_entry=Nu&evo_registro
New_entry...=&Nuevo_registro...
New_entry_by_type...=&Nuevo_registro...
New_entry_from_plain_text=Nue&vo_registro_desde_texto_sin_formato
New_subdatabase_based_on_AUX_file=Nueva_sub-base_de_datos_a_partir_de_archivo_AU&X
#_View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_fa.properties
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Mark_entries=نشان_گذاری_ورودی‌ها
New_database=پایگاه_داده_جدید
# Menu BibTeX (BibTeX)
New_entry=ورودی_جدید
New_entry...=ورودی_جدید...
New_entry_by_type...=ورودی_جدید...
New_entry_from_plain_text=ورودی_جدید_از_نوشته ساده
New_subdatabase_based_on_AUX_file=پایگاه_داده_جدید_براساس_پرونده_AUX
# View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Manage_journal_abbreviations=G\u00e9rer_les_abr\u00e9viations_de_&journaux
Mark_entries=Etiqueter_des_&entr\u00e9es
New_database=&Nouvelle_base
New_entry=N&ouvelle_entr\u00e9e
New_entry...=&Nouvelle_entr\u00e9e...
New_entry_by_type...=&Nouvelle_entr\u00e9e...
New_entry_from_plain_text=Nouvelle_entr\u00e9e_depuis_&texte_brut
New_subdatabase_based_on_AUX_file=Nouveau_Fichier_BibTeX_depuis_fichier_AU&X
Next_tab=Onglet_&suivant
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_in.properties
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Mark_entries=Tandai_entri
Mark_specific_color=Tandai_dengan_warna
New_database=Basisdata_baru
New_entry=Entri_baru
New_entry...=Entri_baru...
New_entry_by_type...=Entri_baru...
New_entry_from_plain_text=Entri_baru_dari_teks_biasa
New_subdatabase_based_on_AUX_file=Anak_basisdata_baru_dari_berkas_AUX
Next_tab=Tab_berikutnya
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Mark_entries=E&videnzia
New_database=&Nuovo_database
# Menu BibTeX (BibTeX)
New_entry=&Nuova_voce
New_entry...=N&uova_voce...
New_entry_by_type...=N&uova_voce...
New_entry_from_plain_text=Nuova_voce_da_&testo
New_subdatabase_based_on_AUX_file=Nuovo_sub-database_da_file_AU&X
# View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_ja.properties
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Mark_entries=\u9805\u76ee\u306b\u6a19\u8b58\u3092\u4ed8\u3051\u308b(&M)
New_database=\u65b0\u898f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9(&N)
# Menu BibTeX (BibTeX)
New_entry=\u65b0\u898f\u9805\u76ee(&E)
New_entry...=\u65b0\u898f\u9805\u76ee(&N)\u2026
New_entry_by_type...=\u65b0\u898f\u9805\u76ee(&N)\u2026
New_entry_from_plain_text=\u5e73\u6587\u304b\u3089\u65b0\u898f\u9805\u76ee(&W)
New_subdatabase_based_on_AUX_file=AU&X\u30d5\u30a1\u30a4\u30eb\u306b\u57fa\u3065\u304f\u65b0\u898f\u526f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
# View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_nl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ New_database=Nieuwe_database
# Menu BibTeX (BibTeX)
New_entry=Nieuwe_entry

New_entry...=Nieuwe_entry...
New_entry_by_type...=Nieuwe_entry...

New_entry_from_plain_text=Nieuwe_entry_van_onopgemaakte_tekst

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_no.properties
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Mark_entries=&Merk_enheter
New_database=&Ny_database
# Menu BibTeX (BibTeX)
New_entry=N&y_enhet
New_entry...=&Ny_enhet...
New_entry_by_type...=&Ny_enhet...
New_entry_from_plain_text=Ny_&enhet_fra_ren_tekst
New_subdatabase_based_on_AUX_file=Ny_deldatabase_basert_p\u00e5_AU&X-fil
# View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_pt_BR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Manage_journal_abbreviations=Gerenciar_&abrevia\u00e7\u00f5es_de_peri\u00f3dicos
Mark_entries=&Marcar_refer\u00eancias
New_database=&Nova_base_de_dados
New_entry=No&va_refer\u00eancia
New_entry...=N&ova_refer\u00eancia...
New_entry_by_type...=N&ova_refer\u00eancia...
New_entry_from_plain_text=Nova_refer\u00eancia_a_partir_de_texto_&puro
New_subdatabase_based_on_AUX_file=Nova_base_de_dados_a_partir_de_um_arquivo_AU&X
Next_tab=Pr\u00f3xima_a&ba
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_ru.properties
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Mark_entries=Метки_записей
New_database=Создать_БД
# Menu BibTeX (BibTeX)
New_entry=Создать_запись
New_entry...=Создать_запись...
New_entry_by_type...=Создать_запись...
New_entry_from_plain_text=Создать_запись_из_неформатированного_текста
New_subdatabase_based_on_AUX_file=Создать_подчиненную_БД_на_основе_AUX-файла
# View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_tr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Manage_journal_abbreviations=Der&gi_k\u0131saltmalar\u0131n\u0131_y\u00f6net
Mark_entries=Girdileri_i\u015f&aretle
New_database=Ye&ni_veritaban\u0131
New_entry=Y&eni_girdi
New_entry...=Ye&ni_girdi...
New_entry_by_type...=Ye&ni_girdi...
New_entry_from_plain_text=D\u00fcz_metinden_&yeni_girdi
New_subdatabase_based_on_AUX_file=AU&X_dosyas\u0131_tabanl\u0131_yeni_altveritaban\u0131
Next_tab=So&nraki_sekme
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_vi.properties
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Mark_entries=\u0110\u00e1nh_&d\u1ea5u_c\u00e1c_m\u1ee5c
New_database=&CSDL_m\u1edbi
# Menu BibTeX (BibTeX)
New_entry=&M\u1ee5c_m\u1edbi
New_entry...=&M\u1ee5c_m\u1edbi...
New_entry_by_type...=&M\u1ee5c_m\u1edbi...
New_entry_from_plain_text=M\u1ee5c_m\u1edbi_t\u1eeb_&v\u0103n_b\u1ea3n_tr\u01a1n
New_subdatabase_based_on_AUX_file=C\u01a1_s\u1edf_d\u1eef_li\u1ec7u_con_m\u1edbi_d\u1ef1a_tr\u00ean_t\u1eadp_tin_AU&X
# View
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/l10n/Menu_zh.properties
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Mark_entries=\u9ad8\u4eae\u6807\u8bb0\u9009\u4e2d\u8bb0\u5f55_(&M)
New_database=\u65b0\u5efa\u6570\u636e\u5e93_(&N)
# Menu BibTeX (BibTeX)
New_entry=\u65b0\u5efa\u8bb0\u5f55\u5411\u5bfc_(&e)
New_entry...=\u65b0\u5efa\u8bb0\u5f55_(&N)...
New_entry_by_type...=\u65b0\u5efa\u8bb0\u5f55_(&N)...
New_entry_from_plain_text=\u4ee5\u7eaf\u6587\u672c\u65b0\u5efa\u8bb0\u5f55_(&W)
New_subdatabase_based_on_AUX_file=\u6839\u636e_AU&X_\u6587\u4ef6\u65b0\u5efa\u5b50\u6570\u636e\u5e93
# View
Expand Down

0 comments on commit 8ed2a60

Please sign in to comment.