X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2FSetLanguage.java;h=27ec94e0a42f61022c69ad8f034a5bff51e8075b;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=f2ef5d3bb3073a5617fe3f2e38ca01a39dec658f;hpb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;p=GpsPrune.git

diff --git a/tim/prune/function/SetLanguage.java b/tim/prune/function/SetLanguage.java
index f2ef5d3..27ec94e 100644
--- a/tim/prune/function/SetLanguage.java
+++ b/tim/prune/function/SetLanguage.java
@@ -36,20 +36,20 @@ import tim.prune.load.GenericFileFilter;
 public class SetLanguage extends GenericFunction
 {
 	private JDialog _dialog = null;
-	private JComboBox _languageDropDown = null;
+	private JComboBox<String> _languageDropDown = null;
 	private JTextField _langFileBox = null;
 	private int _startIndex = 0;
 
 	/** Names of languages for display in dropdown (not translated) */
-	private static final String[] LANGUAGE_NAMES = {"\u010de\u0161tina", "deutsch", "english",
+	private static final String[] LANGUAGE_NAMES = {"\u010de\u0161tina", "deutsch", "english", "american english",
 		"espa\u00F1ol", "fran\u00E7ais", "italiano", "magyar", "nederlands", "polski",
-		"portugu\u00EAs", "\u4e2d\u6587 (chinese)", "\u65E5\u672C\u8A9E (japanese)",
+		"portugu\u00EAs", "\u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian)", "\u4e2d\u6587 (chinese)", "\u65E5\u672C\u8A9E (japanese)",
 		"\uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean)", "schwiizerd\u00FC\u00FCtsch", "t\u00FCrk\u00E7e",
-		"rom\u00E2n\u0103", "afrikaans", "bahasa indonesia", "farsi"
+		"afrikaans", "rom\u00E2n\u0103", "\u0443\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430 \u043c\u043e\u0432\u0430 (ukrainian)"
 	};
 	/** Associated language codes (must be in same order as names!) */
-	private static final String[] LANGUAGE_CODES = {"cz", "de", "en", "es", "fr", "it", "hu",
-		"nl", "pl", "pt", "zh", "ja", "ko", "de_ch", "tr", "ro", "af", "in", "fa"
+	private static final String[] LANGUAGE_CODES = {"cz", "de", "en", "en_us", "es", "fr", "it", "hu",
+		"nl", "pl", "pt", "ru", "zh", "ja", "ko", "de_ch", "tr", "af", "ro", "uk"
 	};
 
 
@@ -99,7 +99,7 @@ public class SetLanguage extends GenericFunction
 		builtinPanel.setLayout(new BoxLayout(builtinPanel, BoxLayout.X_AXIS));
 		builtinPanel.add(new JLabel(I18nManager.getText("dialog.setlanguage.language") + " : "));
 		// Language dropdown
-		_languageDropDown = new JComboBox(LANGUAGE_NAMES);
+		_languageDropDown = new JComboBox<String>(LANGUAGE_NAMES);
 		builtinPanel.add(_languageDropDown);
 		builtinPanel.add(Box.createHorizontalGlue());
 		JButton selectLangButton = new JButton(I18nManager.getText("button.select"));
@@ -327,8 +327,10 @@ public class SetLanguage extends GenericFunction
 	 */
 	private void showEndMessage()
 	{
+		final String messageKey = Config.getConfigBoolean(Config.KEY_AUTOSAVE_SETTINGS)?
+			"dialog.setlanguage.endmessagewithautosave":"dialog.setlanguage.endmessage";
 		JOptionPane.showMessageDialog(_parentFrame,
-			I18nManager.getText("dialog.setlanguage.endmessage"),
+			I18nManager.getText(messageKey),
 			I18nManager.getText(getNameKey()), JOptionPane.INFORMATION_MESSAGE);
 	}
 }