mirror of
https://github.com/alexkay/spek.git
synced 2025-06-18 07:53:20 +03:00
i18n: Really fix '(system default)' translation
This commit is contained in:
parent
f18acb72bd
commit
2bc90c30a5
2
dist/README
vendored
2
dist/README
vendored
@ -9,7 +9,7 @@ Spek release checklist
|
|||||||
* `tx pull -a`.
|
* `tx pull -a`.
|
||||||
* Update the list of available languages, 80% or so will do:
|
* Update the list of available languages, 80% or so will do:
|
||||||
* po/LINGUAS
|
* po/LINGUAS
|
||||||
* src/spek-preferences.vala
|
* src/spek-preferences-dialog.vala
|
||||||
* dist/win/bundle.sh
|
* dist/win/bundle.sh
|
||||||
* dist/osx/bundle.sh
|
* dist/osx/bundle.sh
|
||||||
* Update AUTHORS using `git log X.Y.. --pretty=format:"%an <%ae>" | sort -u`.
|
* Update AUTHORS using `git log X.Y.. --pretty=format:"%an <%ae>" | sort -u`.
|
||||||
|
@ -20,11 +20,27 @@ using Gtk;
|
|||||||
|
|
||||||
namespace Spek {
|
namespace Spek {
|
||||||
public class PreferencesDialog : Gtk.Dialog {
|
public class PreferencesDialog : Gtk.Dialog {
|
||||||
|
// List all languages with a decent (e.g. 80%) number of translated
|
||||||
|
// strings. Don't translate language names. Keep the first line intact.
|
||||||
|
private static string[,] languages = {
|
||||||
|
{"", null},
|
||||||
|
{"de", "Deutsch"},
|
||||||
|
{"en", "English"},
|
||||||
|
{"es", "Español"},
|
||||||
|
{"fr", "Français"},
|
||||||
|
{"nl", "Nederlands"},
|
||||||
|
{"pl", "Polski"},
|
||||||
|
{"ru", "Русский"},
|
||||||
|
{"sv", "Svenska"},
|
||||||
|
{"uk", "Українська"}
|
||||||
|
};
|
||||||
|
|
||||||
public PreferencesDialog () {
|
public PreferencesDialog () {
|
||||||
title = _("Preferences");
|
title = _("Preferences");
|
||||||
modal = true;
|
modal = true;
|
||||||
resizable = false;
|
resizable = false;
|
||||||
window_position = WindowPosition.CENTER_ON_PARENT;
|
window_position = WindowPosition.CENTER_ON_PARENT;
|
||||||
|
languages[0,1] = _("(system default)");
|
||||||
|
|
||||||
var alignment = new Alignment (0.5f, 0.5f, 1f, 1f);
|
var alignment = new Alignment (0.5f, 0.5f, 1f, 1f);
|
||||||
alignment.set_padding (12, 12, 12, 12);
|
alignment.set_padding (12, 12, 12, 12);
|
||||||
@ -47,15 +63,15 @@ namespace Spek {
|
|||||||
var language_combo = new ComboBox.text ();
|
var language_combo = new ComboBox.text ();
|
||||||
int active_language = 0;
|
int active_language = 0;
|
||||||
var prefs = Preferences.instance;
|
var prefs = Preferences.instance;
|
||||||
for (int i = 0; i < prefs.languages.length[0]; i++) {
|
for (int i = 0; i < languages.length[0]; i++) {
|
||||||
language_combo.append_text (prefs.languages[i,1]);
|
language_combo.append_text (languages[i,1]);
|
||||||
if (prefs.languages[i,0] == prefs.language) {
|
if (languages[i,0] == prefs.language) {
|
||||||
active_language = i;
|
active_language = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
language_combo.active = active_language;
|
language_combo.active = active_language;
|
||||||
language_combo.changed.connect (
|
language_combo.changed.connect (
|
||||||
() => prefs.language = prefs.languages[language_combo.active,0]);
|
() => prefs.language = languages[language_combo.active,0]);
|
||||||
language_label.mnemonic_widget = language_combo;
|
language_label.mnemonic_widget = language_combo;
|
||||||
language_box.pack_start (language_combo, false, false, 0);
|
language_box.pack_start (language_combo, false, false, 0);
|
||||||
general_subbox.pack_start(language_box, false, false, 0);
|
general_subbox.pack_start(language_box, false, false, 0);
|
||||||
|
@ -21,21 +21,6 @@ namespace Spek {
|
|||||||
private KeyFile key_file;
|
private KeyFile key_file;
|
||||||
private string file_name;
|
private string file_name;
|
||||||
|
|
||||||
// List all languages with a decent (e.g. 80%) number of translated
|
|
||||||
// strings. Don't translate language names. Keep the first line intact.
|
|
||||||
public string[,] languages = {
|
|
||||||
{"", null},
|
|
||||||
{"de", "Deutsch"},
|
|
||||||
{"en", "English"},
|
|
||||||
{"es", "Español"},
|
|
||||||
{"fr", "Français"},
|
|
||||||
{"nl", "Nederlands"},
|
|
||||||
{"pl", "Polski"},
|
|
||||||
{"ru", "Русский"},
|
|
||||||
{"sv", "Svenska"},
|
|
||||||
{"uk", "Українська"}
|
|
||||||
};
|
|
||||||
|
|
||||||
private Preferences () {
|
private Preferences () {
|
||||||
file_name = Path.build_filename (Environment.get_user_config_dir (), "spek");
|
file_name = Path.build_filename (Environment.get_user_config_dir (), "spek");
|
||||||
DirUtils.create_with_parents (file_name, 0755);
|
DirUtils.create_with_parents (file_name, 0755);
|
||||||
@ -58,9 +43,6 @@ namespace Spek {
|
|||||||
if (_instance == null) {
|
if (_instance == null) {
|
||||||
_instance = new Preferences ();
|
_instance = new Preferences ();
|
||||||
}
|
}
|
||||||
if (_instance.languages[0,1] == null) {
|
|
||||||
_instance.languages[0,1] = _("(system default)");
|
|
||||||
}
|
|
||||||
return _instance;
|
return _instance;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user