Merge remote-tracking branch 'upstream/master' into officeXML

* upstream/master: Fix journal title in ris importer (#2510) French localization: Main file: translations of strings (#2512) # Conflicts: # CHANGELOG.md
JabRef · Feb 2, 2017 · bd18f96 · bd18f96
2 parents 937628e + 99223c4
commit bd18f96
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 
 ### Fixed
  - Repairs the handling of apostrophes in the LaTeX to unicode conversion. [#2500](https://github.com/JabRef/jabref/issues/2500)
+ - Fix import of journal title in ris format. [#2506](https://github.com/JabRef/jabref/issues/2506)
  - We fixed the export of the `number` field in MS-Office XML export. [#2509](https://github.com/JabRef/jabref/issues/2509)
 	- The field `issue` is now always exported to the corresponding `issue` field in MS-Office XML.
 ### Removed

diff --git a/src/main/java/net/sf/jabref/logic/importer/fileformat/RisImporter.java b/src/main/java/net/sf/jabref/logic/importer/fileformat/RisImporter.java
@@ -129,7 +129,11 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         fields.put(FieldName.TITLE, fields.get(FieldName.TITLE).replaceAll("\\s+", " ")); // Normalize whitespaces
                     } else if ("BT".equals(tag)) {
                         fields.put(FieldName.BOOKTITLE, value);
-                    } else if ("T2".equals(tag) || "JO".equals(tag)) {
+                    } else if ("T2".equals(tag) && (fields.get(FieldName.JOURNAL) == null || "".equals(fields.get(FieldName.JOURNAL)))) {
+                        //if there is no journal title, then put second title as journal title
+                        fields.put(FieldName.JOURNAL, value);
+                    } else if ("JO".equals(tag)) {
+                        //if this field appears then this should be the journal title
                         fields.put(FieldName.JOURNAL, value);
                     } else if ("T3".equals(tag)) {
                         fields.put(FieldName.SERIES, value);

diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
@@ -1961,13 +1961,14 @@ abbreviation_detected=Abréviation_détectée
 wrong_entry_type_as_proceedings_has_page_numbers=Mauvais_type_d'entrée_car_le_proceedings_a_des_numéros_de_page
 Abbreviate_journal_names=Abrégez_les_noms_de_journaux
 Abbreviating...=Abrègement_en_cours
-Abbreviation_%s_for_journal_%s_already_defined.=
-Abbreviation_cannot_be_empty=
-Duplicated_Journal_Abbreviation=
-Duplicated_Journal_File=
-Error_Occurred=
-Journal_file_%s_already_added=
-Name_cannot_be_empty=
+Abbreviation_%s_for_journal_%s_already_defined.=L'abréviation_%s_pour_le_journal_%s_existe_déjà.
+
+Abbreviation_cannot_be_empty=L'abréviation_ne_peut_pas_être_vide
+Duplicated_Journal_Abbreviation=Abréviation_de_journal_dupliquée
+Duplicated_Journal_File=Fichier_de_journaux_dupliqué
+Error_Occurred=Une_erreur_s'est_produite
+Journal_file_%s_already_added=Le_fichier_de_journaux_%s_a_déjà_été_ajouté
+Name_cannot_be_empty=Le_nom_ne_peut_pas_être_vide
 
 Adding_fetched_entries=Ajout_des_entrées_récupérées
 Display_keywords_appearing_in_ALL_entries=Afficher_les_mots-clefs_apparaissant_dans_TOUTES_les_entrées
@@ -2098,10 +2099,10 @@ Show_diff=Montrer_les_différences
 character=caractère
 word=mot
 Show_symmetric_diff=Montre_les_différences_symétriques
-Copy_Version=
-Developers=
-Authors=
-License=
+Copy_Version=Copier_le_version
+Developers=Développeurs
+Authors=Auteurs
+License=Licence
 
 HTML_encoded_character_found=Caractère_encodé_en_HTML_trouvé
 booktitle_ends_with_'conference_on'=le_titre_d'ouvrage_se_termine_par_'conference_on'
@@ -2118,8 +2119,8 @@ BibTeX_key=Clef_BibTeX
 Message=Message
 
 
-MathSciNet_Review=
-Reset_Bindings=
+MathSciNet_Review=Review_MathSciNet
+Reset_Bindings=Réinitialiser_les_associations
 
 Decryption_not_supported.=Déchiffrement_non_supporté.
 
@@ -2184,29 +2185,31 @@ Entry_from_%0=Entrée_à_partir_du_%0
 Merge_entry_with_%0_information=Fusionner_l'entrée_sur_la_base_des_informations_du_%0
 Updated_entry_with_info_from_%0=Entrée_mise_à_jour_à_partir_des_informations_du_%0
 
-Add_existing_file=
-Create_new_list=
-Remove_list=
-Full_journal_name=
-Abbreviation_name=
+Add_existing_file=Ajouter_un_fichier_existant
+Create_new_list=Créer_une_nouvelle_liste
+Remove_list=Supprimer_une_liste
+Full_journal_name=Nom_de_journal_complet
+Abbreviation_name=Nom_abrégé
+
+No_abbreviation_files_loaded=Aucun_fichier_d'abréviation_n'est_chargé
+
+Loading_built_in_lists=Chargement_des_listes_internes
 
-No_abbreviation_files_loaded=
+JabRef_built_in_list=Liste_interne_de_JabRef
+IEEE_built_in_list=List_interne_de_IEEE
 
-Loading_built_in_lists=
+Event_log=Journal_des_évènements
+We_now_give_you_insight_into_the_inner_workings_of_JabRef\'s_internals._This_information_might_be_helpful_to_diagnose_the_root_cause_of_a_problem._Please_feel_free_to_inform_the_developers_about_an_issue.=Nous_vous_donnons_à_présent_un_aperçu_du_fonctionnemment_interne_de_JabRef._Cette_information_pourrait_être_utile_pour_diagnostiquer_la_cause_du_problème._S'il_vous_plaît,_informez_les_développeurs_des_anomalies_rencontrées.
 
-JabRef_built_in_list=
-IEEE_built_in_list=
 
-Event_log=
-We_now_give_you_insight_into_the_inner_workings_of_JabRef\'s_internals._This_information_might_be_helpful_to_diagnose_the_root_cause_of_a_problem._Please_feel_free_to_inform_the_developers_about_an_issue.=
-Log_copied_to_clipboard.=
-Copy_Log=
-Report_Issue=
-Issue_on_GitHub_successfully_reported.=
-Issue_report_successful=
-Your_issue_was_reported_in_your_browser.=
-The_log_and_exception_information_was_copied_to_your_clipboard.=
-Please_paste_this_information_(with_Ctrl+V)_in_the_issue_description.=
+Log_copied_to_clipboard.=Journal_copié_dans_le_presse-papiers.
+Copy_Log=Copier_le_journal
+Report_Issue=Signaler_l'anomalie
+Issue_on_GitHub_successfully_reported.=Anomalie_signalé_avec_succès_sur_GitHub.
+Issue_report_successful=Signalement_de_l'anomalie_réussi
+Your_issue_was_reported_in_your_browser.=Votre_anomalie_a_été_affichée_dans_votre_navigateur.
+The_log_and_exception_information_was_copied_to_your_clipboard.=Le_journal_et_les_informations_d'anomalie_ont_été_copiées_dans_votre_presse-papier.
+Please_paste_this_information_(with_Ctrl+V)_in_the_issue_description.=SVP,_collez_ces_informations_(avec_Ctrl+V)_dans_la_description_de_l'anomalie.
 
 Connection=Connection
 Connecting...=Connexion_en_cours...
@@ -2279,13 +2282,13 @@ last_four_nonpunctuation_characters_should_be_numerals=Les_4_derniers_caractère
 shared=partagé
 should_contain_an_integer_or_a_literal=doit_contenir_un_nombre_entier_ou_en_toutes_lettres
 should_have_the_first_letter_capitalized=doit_avoir_une_première_lettre_en_majuscule
-Tools=
-What\'s_new_in_this_version?=
-Want_to_help?=
-Make_a_donation=
-get_involved=
-Used_libraries=
-MIT=
+Tools=Outils
+What\'s_new_in_this_version?=Quoi_de_neuf_dans_cette_version_?
+Want_to_help?=Vous_voulez_aider_?
+Make_a_donation=Faire_un_don
+get_involved=S'impliquer
+Used_libraries=Bibliothèques_utilisées
+MIT=MIT
 Existing_file=Fichier_existant
 
 ID=Identifiant
@@ -2318,7 +2321,7 @@ Firstname_Lastname=Prénom_Nom
 Recommended_for_%0=Recommandé_pour_%0
 This_might_be_caused_by_reaching_the_traffic_limitation_of_Google_Scholar_(see_'Help'_for_details).=La_limitation_de_trafic_de_Google_Scholar_pourrait_avoir_été_atteinte_(voir_l'aide_pour_plus_de_détails).
 
-Could_not_open_website.=
+Could_not_open_website.=Le_site_internet_n'a_pas_pu_être_ouvert.
 Problem_downloading_from_%1=Problème_de_téléchargement_à_partir_de_%1
 
 File_directory_pattern=Modèle_de_répertoire_de_fichiers

diff --git a/src/test/java/net/sf/jabref/logic/importer/fileformat/RISImporterTestFiles.java b/src/test/java/net/sf/jabref/logic/importer/fileformat/RISImporterTestFiles.java
@@ -41,7 +41,7 @@ public void setUp() throws URISyntaxException {
     public static Collection<String> fileNames() {
         return Arrays.asList("RisImporterTest1", "RisImporterTest3", "RisImporterTest4a", "RisImporterTest4b",
                 "RisImporterTest4c", "RisImporterTest5a", "RisImporterTest5b", "RisImporterTest6",
-                "RisImporterTestDoiAndJournalTitle", "RisImporterTestScopus");
+                "RisImporterTestDoiAndJournalTitle", "RisImporterTestScopus", "RisImporterTestScience");
     }
 
     @Test

diff --git a/src/test/resources/net/sf/jabref/logic/importer/fileformat/RisImporterTestScience.bib b/src/test/resources/net/sf/jabref/logic/importer/fileformat/RisImporterTestScience.bib
@@ -0,0 +1,13 @@
+@Article{,
+  author        = {Ghosh, Chanchal and Basu, Joysurya and Ramachandran, Divakar and Mohandas, E.},
+  title         = {Phase separation and ω transformation in binary V-Ti and ternary V-Ti-Cr alloys},
+  journal       = {Acta Materialia},
+  year          = {2016},
+  volume        = {121},
+  pages         = {310--324},
+  month         = dec,
+  issn          = {1359-6454},
+  abstract      = {Abstract},
+  keywords      = {V-Ti-Cr alloys, Spinodal decomposition, ω phase transformation, High-resolution electron microscopy, Energy-filtered transmission microscopy},
+  url           = {//www.sciencedirect.com/science/article/pii/S1359645416307273},
+}
diff --git a/src/test/resources/net/sf/jabref/logic/importer/fileformat/RisImporterTestScience.ris b/src/test/resources/net/sf/jabref/logic/importer/fileformat/RisImporterTestScience.ris
@@ -0,0 +1,25 @@
+TY  - JOUR
+T1  - Phase separation and ω transformation in binary V-Ti and ternary V-Ti-Cr alloys
+JO  - Acta Materialia
+VL  - 121
+IS  - 
+SP  - 310
+EP  - 324
+PY  - 2016/12//
+T2  - 
+AU  - Ghosh, Chanchal
+AU  - Basu, Joysurya
+AU  - Ramachandran, Divakar
+AU  - Mohandas, E.
+SN  - 1359-6454
+DO  - http://dx.doi.org/10.1016/j.actamat.2016.09.028
+UR  - //www.sciencedirect.com/science/article/pii/S1359645416307273
+KW  - V-Ti-Cr alloys
+KW  - Spinodal decomposition
+KW  - ω phase transformation
+KW  - High-resolution electron microscopy
+KW  - Energy-filtered transmission microscopy
+AB  - Abstract
+ER  - 
+
+