Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Localization cleanup for 3.0 #390

Merged
merged 27 commits into from
Nov 27, 2015
Merged

Conversation

matthiasgeiger
Copy link
Member

  • Adds missing keys to JabRef_en.properties
  • Check whether alternative, already existing keys can be reused
  • remove obsolete keys
  • Cleanup discrepancies listed by mlep
  • Add missing keys for all other languages
  • Integrate search localizations
  • Resort? Non-Empty Alphabetically followed by Empty Alphabetically?

@@ -352,7 +352,7 @@ private void setupLogHandlerForErrorConsole() {
}
session.commit();
} catch (SaveException ex) {
System.err.println(Localization.lang("Could not save file") + " '" + data[0] + "': "
System.err.println(Localization.lang("Could not save file.") + "\n"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use Could not save file %0. to print out the file name as well?

@simonharrer
Copy link
Contributor

👍

@koppor
Copy link
Member

koppor commented Nov 26, 2015

@KojiYokota Also added added some missing keys to JabRef_ja.properties. Don't know if that information comes too late.

@matthiasgeiger
Copy link
Member Author

@koppor Not a problem - I just wondered why some keys are already present in the Japanese l10n 😉

@mlep
Copy link
Contributor

mlep commented Nov 26, 2015

I have looked at the discrepancies between the keys and their English localization.
Since it is clean-up time, some keys should be updated. And since it is better for everybody that I do not modify the java code 😉, here is the list.

Based on the master branch,
In Menu_en.properties:

Find_And_Fix=     should be Find_and_Fix=
Save_selected_as_plain_BibTeX_...= should be Save_selected_as_plain_BibTeX...=

In JabRef_en.properties:

Add_Group= should be Add_group=
Add_Subgroup= should be Add_subgroup=
An_Exception_ocurred_while_accessing_'%0'= should be An_Exception_occurred_while_accessing_'%0'=
An_SAXException_ocurred_while_parsing_'%0'\:= should be An_SAXException_occurred_while_parsing_'%0'\:=
Available_fields= should be Allowed_BibTeX_fields=
                                                    (based on the context of use)
Bibtex_entry_creation= should be BibTeX_entry_creation=
Cite_selected_entries= should be Cite_selected_entries_between_parenthesis=
                                                    (based on the context of use)
Cut_pr= should be Cut=
Database_\:= should be Database\:=
Edit_file_link= should be Save_file=
                                                    (based on the context of use)
Error_occured_when_parsing_entry= should be Error_occurred_when_parsing_entry=
Import_Metadata_from:= should be Import_metadata_from\:=
Input= should be= Work options= 
                                                    (based on the context of use)
Messages_and_Hints= should be Hints_and_Warnings=
                                                    (based on the context of use)
no_base-bibtex-file_specified= should be no_base-BibTeX-file_specified=
No_exceptions_have_ocurred.= should be No_exceptions_have_occurred.=
Password_:= should be Password:=
Remove_all_subgroups= should be Remove_subgroups=
                                                    (based on the context of use)
Reset_file_type_definitons= should be Reset_file_type_definitions=
Server_Hostname_:= should be Server_Hostname\:=
Server_Type_:= should be Server_Type\:=
Show_optional_fields= should be Show_optional_field=
Sort_Automatically= should be Sort_automatically=
Sort_fields_in_alphabeta_order_(as_ver_2.10)= should be Sort_fields_in_alphabetic_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)= should be Sort_fields_in_old_fashion_(as_ver_2.9.2)=
Starts_the_import_of_bibtex_entries.= should be Starts_the_import_of_BibTeX_entries.=
Text_Input_Area= should be paste_text_here=
To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>= should be To_set_up,_go_to_<B>Options_->_Manage_journal_abbreviations</B>=
Unable_to_connect_to_freecite_online_service.= should be Unable_to_connect_to_FreeCite_online_service.=
Username_:= should be Username:=

@matthiasgeiger
Copy link
Member Author

Thanks for another few hours work 😉

@mlep
Copy link
Contributor

mlep commented Nov 26, 2015

@koppor should be blamed: he is the one pointing me to this thread... 😉

@matthiasgeiger matthiasgeiger force-pushed the localization_cleanup_for_3.0 branch from a1b02b4 to 6d5a726 Compare November 27, 2015 10:21
@matthiasgeiger
Copy link
Member Author

Phewww... should be ready to merge...

@matthiasgeiger
Copy link
Member Author

Ahh one thing to be discussed... maybe @mlep can help here:

Should we resort the files somehow?

All already translated keys to top - all untranslated to the end?

Sorting translated/untranslated alphabetically?

@simonharrer
Copy link
Contributor

I vote for alphabetically in total.

Why:

  • scripts can easily add entries
  • no manual moving of untranslated into the translated section when translating
  • version control can show nice diffs for adding translation texts

Btw. nice work here!

@matthiasgeiger
Copy link
Member Author

In general I agree, but depending on the workflow of the translaters it might be useful to seperate all untranslated items from the ones already translated...

@simonharrer
Copy link
Contributor

I would propose to merge this quickly, as it affects a lot of different lines in the code. And the effort should not be wasted.

@matthiasgeiger matthiasgeiger changed the title [WIP] Localization cleanup for 3.0 Localization cleanup for 3.0 Nov 27, 2015
@matthiasgeiger
Copy link
Member Author

👍

I'll add the remaining German translations directly in master.

matthiasgeiger added a commit that referenced this pull request Nov 27, 2015
@matthiasgeiger matthiasgeiger merged commit 251441d into master Nov 27, 2015
@stefan-kolb stefan-kolb deleted the localization_cleanup_for_3.0 branch November 27, 2015 13:24
@mlep
Copy link
Contributor

mlep commented Nov 27, 2015

To make things easier, when empty keys are added to a file, they are added at the end. This way the translators find them easily (not everybody is using Popeye).
And, from time to time (typically near the release of a new version), we sort them alphabetically.

@koppor
Copy link
Member

koppor commented Nov 27, 2015

👍

I would propose to group the entries by usage in the UI, so that related entries are appearing next to each other. I know that this is more difficult to maintain, but more easy for the translators.

I think popeye can sort the columns according to empty entries.

@matthiasgeiger
Copy link
Member Author

Mhmm... I will not group those ~1500 lines by UI usage 😉

@ambro2
Copy link
Contributor

ambro2 commented Nov 27, 2015

Some comments about sorting the keys.
Sorting alphabetically could be ok, provided that untraslated keys are grouped at the end of the file. Using popeye could be helpful in locating untraslated keys, but once translated it's difficult to came back to the just translated key, maybe to reword or reuse part of the translation. Furthermore, in some cases I put comments above or below the translated keys (e.g. when the context is not clear): when sorting alphabetically the comments will be lost. BTW, could it be possible to put comments at the end of the line?
So, I second the proposal from @mlep: sorting alphabetically but keep untraslated keys at the end of the file.
Even better would be grouping by usage, but I understand the difficulty to mantain.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants