diff options
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rwxr-xr-x | po/compile.py | 3 | ||||
-rw-r--r-- | res/lang/de.bin | bin | 3068 -> 0 bytes | |||
-rw-r--r-- | res/lang/fi.bin | bin | 16959 -> 17150 bytes | |||
-rw-r--r-- | res/lang/ru.bin | bin | 23752 -> 25157 bytes | |||
-rw-r--r-- | res/lang/zh_Hans.bin | bin | 15191 -> 15251 bytes | |||
-rw-r--r-- | src/lang.c | 2 | ||||
-rw-r--r-- | src/ui/util.c | 6 |
8 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b4200728..18573960 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -74,7 +74,6 @@ set (EMBED_RESOURCES | |||
74 | res/fonts/SourceSansPro-Regular.ttf | 74 | res/fonts/SourceSansPro-Regular.ttf |
75 | res/fonts/SourceSansPro-Bold.ttf | 75 | res/fonts/SourceSansPro-Bold.ttf |
76 | res/fonts/Symbola.ttf | 76 | res/fonts/Symbola.ttf |
77 | res/lang/de.bin | ||
78 | res/lang/en.bin | 77 | res/lang/en.bin |
79 | res/lang/fi.bin | 78 | res/lang/fi.bin |
80 | res/lang/ru.bin | 79 | res/lang/ru.bin |
diff --git a/po/compile.py b/po/compile.py index 6416ea0e..58aa5220 100755 --- a/po/compile.py +++ b/po/compile.py | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | import os, sys | 5 | import os, sys |
6 | 6 | ||
7 | BUILD_LANGS = ['en', 'fi', 'ru', 'zh_Hans'] | ||
7 | MODE = 'compile' | 8 | MODE = 'compile' |
8 | ESCAPES = { | 9 | ESCAPES = { |
9 | '\\': '\\', | 10 | '\\': '\\', |
@@ -82,7 +83,7 @@ def parse_po(src): | |||
82 | 83 | ||
83 | if MODE == 'compile': | 84 | if MODE == 'compile': |
84 | for src in os.listdir('.'): | 85 | for src in os.listdir('.'): |
85 | if src.endswith('.po'): | 86 | if src.endswith('.po') and src.split('.')[0] in BUILD_LANGS: |
86 | # Make a binary blob with strings sorted by ID. | 87 | # Make a binary blob with strings sorted by ID. |
87 | compiled = bytes() | 88 | compiled = bytes() |
88 | for msg in sorted(parse_po(src)): | 89 | for msg in sorted(parse_po(src)): |
diff --git a/res/lang/de.bin b/res/lang/de.bin deleted file mode 100644 index 9a8e509f..00000000 --- a/res/lang/de.bin +++ /dev/null | |||
Binary files differ | |||
diff --git a/res/lang/fi.bin b/res/lang/fi.bin index b92470d0..11ac7d29 100644 --- a/res/lang/fi.bin +++ b/res/lang/fi.bin | |||
Binary files differ | |||
diff --git a/res/lang/ru.bin b/res/lang/ru.bin index 4b86d856..e13599d6 100644 --- a/res/lang/ru.bin +++ b/res/lang/ru.bin | |||
Binary files differ | |||
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin index 74d4b03d..672c0665 100644 --- a/res/lang/zh_Hans.bin +++ b/res/lang/zh_Hans.bin | |||
Binary files differ | |||
@@ -54,7 +54,7 @@ static void load_Lang_(iLang *d, const char *id) { | |||
54 | iUnused(id); | 54 | iUnused(id); |
55 | const iBlock *data = equal_CStr(id, "fi") ? &blobFi_Embedded | 55 | const iBlock *data = equal_CStr(id, "fi") ? &blobFi_Embedded |
56 | : equal_CStr(id, "ru") ? &blobRu_Embedded | 56 | : equal_CStr(id, "ru") ? &blobRu_Embedded |
57 | : equal_CStr(id, "de") ? &blobDe_Embedded | 57 | // : equal_CStr(id, "de") ? &blobDe_Embedded |
58 | : equal_CStr(id, "zh_Hans") ? &blobZh_Hans_Embedded | 58 | : equal_CStr(id, "zh_Hans") ? &blobZh_Hans_Embedded |
59 | : &blobEn_Embedded; | 59 | : &blobEn_Embedded; |
60 | if (data == &blobRu_Embedded) { | 60 | if (data == &blobRu_Embedded) { |
diff --git a/src/ui/util.c b/src/ui/util.c index ea910eb6..7db2c9bc 100644 --- a/src/ui/util.c +++ b/src/ui/util.c | |||
@@ -1787,10 +1787,12 @@ static void addFontButtons_(iWidget *parent, const char *id) { | |||
1787 | delete_Array(items); | 1787 | delete_Array(items); |
1788 | } | 1788 | } |
1789 | 1789 | ||
1790 | #if 0 | ||
1790 | static int cmp_MenuItem_(const void *e1, const void *e2) { | 1791 | static int cmp_MenuItem_(const void *e1, const void *e2) { |
1791 | const iMenuItem *a = e1, *b = e2; | 1792 | const iMenuItem *a = e1, *b = e2; |
1792 | return iCmpStr(a->label, b->label); | 1793 | return iCmpStr(a->label, b->label); |
1793 | } | 1794 | } |
1795 | #endif | ||
1794 | 1796 | ||
1795 | iWidget *makePreferences_Widget(void) { | 1797 | iWidget *makePreferences_Widget(void) { |
1796 | iWidget *dlg = makeSheet_Widget("prefs"); | 1798 | iWidget *dlg = makeSheet_Widget("prefs"); |
@@ -1828,7 +1830,7 @@ iWidget *makePreferences_Widget(void) { | |||
1828 | /* UI languages. */ { | 1830 | /* UI languages. */ { |
1829 | iArray *uiLangs = collectNew_Array(sizeof(iMenuItem)); | 1831 | iArray *uiLangs = collectNew_Array(sizeof(iMenuItem)); |
1830 | const iMenuItem langItems[] = { | 1832 | const iMenuItem langItems[] = { |
1831 | { "${lang.de} - de", 0, 0, "uilang id:de" }, | 1833 | // { "${lang.de} - de", 0, 0, "uilang id:de" }, |
1832 | { "${lang.en} - en", 0, 0, "uilang id:en" }, | 1834 | { "${lang.en} - en", 0, 0, "uilang id:en" }, |
1833 | { "${lang.fi} - fi", 0, 0, "uilang id:fi" }, | 1835 | { "${lang.fi} - fi", 0, 0, "uilang id:fi" }, |
1834 | { "${lang.ru} - ru", 0, 0, "uilang id:ru" }, | 1836 | { "${lang.ru} - ru", 0, 0, "uilang id:ru" }, |
@@ -1857,6 +1859,8 @@ iWidget *makePreferences_Widget(void) { | |||
1857 | size_Array(uiLangs))), | 1859 | size_Array(uiLangs))), |
1858 | alignLeft_WidgetFlag), | 1860 | alignLeft_WidgetFlag), |
1859 | "prefs.uilang"); | 1861 | "prefs.uilang"); |
1862 | addChild_Widget(headings, iClob(makePadding_Widget(gap_UI))); | ||
1863 | addChild_Widget(values, iClob(makePadding_Widget(gap_UI))); | ||
1860 | } | 1864 | } |
1861 | #if defined (iPlatformApple) || defined (iPlatformMSys) | 1865 | #if defined (iPlatformApple) || defined (iPlatformMSys) |
1862 | addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.ostheme}"))); | 1866 | addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.ostheme}"))); |