Skip to content

Language locale fix for BugFix #959 #13

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.

Sign up for GitHub

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

Merged
koppor merged 1 commit into from
Jul 23, 2014
Merged

Language locale fix for BugFix #959 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/net/sf/jabref/PreviewPrefsTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public void actionPerformed(ActionEvent e) {
JOptionPane.PLAIN_MESSAGE);
} catch (StringIndexOutOfBoundsException ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.WARNING_MESSAGE);
JOptionPane.showMessageDialog(null, Globals.lang("Parsing error") + ": " + Globals.lang("illegal backslash expression") + ".\n" + ex.getMessage() + "\n" + Globals.lang("Look at stderr for details") + ".", Globals.lang("Parsing error"), JOptionPane.ERROR_MESSAGE);
}
}
});
Expand All @@ -185,7 +185,7 @@ public void actionPerformed(ActionEvent e) {
Globals.lang("Preview"), JOptionPane.PLAIN_MESSAGE);
} catch (StringIndexOutOfBoundsException ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.WARNING_MESSAGE);
JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.ERROR_MESSAGE);
}
}
});
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/net/sf/jabref/export/layout/LayoutHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@

import javax.swing.JOptionPane;

import net.sf.jabref.Globals;

import com.sun.star.ui.GlobalAcceleratorConfiguration;


/**
* Helper class to get a Layout object.
Expand Down Expand Up @@ -376,7 +380,7 @@ private void parseField() throws IOException, StringIndexOutOfBoundsException
for (StringInt entry : parsedEntries.subList(Math.max(0, parsedEntries.size()-6), parsedEntries.size()-1)) {
lastFive.append(entry.s);
}
throw new StringIndexOutOfBoundsException("Backslash parsing error near " + "\'" + lastFive.toString().replace("\n", " ") + "\'");
throw new StringIndexOutOfBoundsException(Globals.lang("Backslash parsing error near") + " \'" + lastFive.toString().replace("\n", " ") + "\'");
}

//System.out.println("NAME:" + name);
Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_da.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,3 +1664,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2421,3 +2421,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
17 changes: 10 additions & 7 deletions src/main/resources/resource/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,10 +1513,6 @@ Sorted_all_subgroups_recursively.=Sorted_all_subgroups_recursively.

Sorted_immediate_subgroups.=Sorted_immediate_subgroups.

Sort_fields_in_alphabeta_order_(as_ver_2.10)=Sort_fields_in_alphabeta_order_(as_ver_2.10)
Sort_fields_in_old_fasion_(as_ver_2.9.2)=Sort_fields_in_old_fasion_(as_ver_2.9.2)
Save_fields_as_user_defined_order=Save_fields_as_user_defined_order

source_edit=source_edit
Special_Name_Formatters=Special_Name_Formatters

Expand Down Expand Up @@ -2402,13 +2398,20 @@ Opened_%0_folder(s).=Opened_%0_folder(s).


Searches_for_unlinked_PDF_files_on_the_file_system=Searches_for_unlinked_PDF_files_on_the_file_system

Save_entries_ordered_as_specified=Save_entries_ordered_as_specified
Save_sort_order=Save_sort_order
Export_entries_ordered_as_specified=Export_entries_ordered_as_specified
Export_sort_order=Export_sort_order
File_Sorting=File_Sorting
Newline_separator=Newline_separator

Save_entries_ordered_as_specified=Save_entries_ordered_as_specified
Save_sort_order=Save_sort_order
Show_Extra_columns=Show_Extra_columns
Save_entries_as_configured_globally=Save_entries_as_configured_globally
Open_=Open_

Sort_fields_in_alphabeta_order_(as_ver_2.10)=Sort_fields_in_alphabeta_order_(as_ver_2.10)
Sort_fields_in_old_fasion_(as_ver_2.9.2)=Sort_fields_in_old_fasion_(as_ver_2.9.2)
Save_fields_as_user_defined_order=Save_fields_as_user_defined_order
Parsing_error=Parsing_error
illegal_backslash_expression=illegal_backslash_expression
Backslash_parsing_error_near=Backslash_parsing_error_near
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,3 +1556,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,3 +1602,9 @@ Save_sort_order=Enregistrer_l'ordre_de_tri
Show_Extra_columns=Montrer_les_colonnes_suppl\u00e9mentaires
Save_entries_as_configured_globally=Enregistrer_les_entr\u00e9es_comme_dans_la_configuration_g\u00e9n\u00e9rale
Open_=Ouvrir_
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_in.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,3 +1575,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_it.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,3 +1686,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_ja.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2406,3 +2406,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_nl.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,3 +2407,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_no.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2873,3 +2873,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
6 changes: 6 additions & 0 deletions src/main/resources/resource/JabRef_pt_BR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,3 +1571,9 @@ Save_sort_order=
Show_Extra_columns=
Save_entries_as_configured_globally=
Open_=
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
Save_fields_as_user_defined_order=
Parsing_error=
illegal_backslash_expression=
Backslash_parsing_error_near=
Loading