Fix localization issues and only prompt once about overwriting themes

t1m0thyj · Oct 16, 2019 · c3c283a · c3c283a
1 parent 65a8774
commit c3c283a
Show file tree

Hide file tree

Showing 26 changed files with 73 additions and 40 deletions.
diff --git a/i18n/build_locale.py b/i18n/build_locale.py
@@ -1,7 +1,8 @@
 import glob
+import json
 import os
-import subprocess
 import sys
+import urllib.request
 
 LOCALE_MAPPING = {
     "cs": "cs_CZ",
@@ -10,6 +11,7 @@
     "es_ES": "es_ES",
     "fr": "fr_FR",
     "it": "it_IT",
+    "mk": "mk_MK",
     "pl": "pl_PL",
     "ro": "ro_RO",
     "ru": "ru_RU",
@@ -21,7 +23,16 @@
 
 from msgfmt import make
 
-subprocess.run(["powershell.exe", "zanata-cli/bin/zanata-cli", "pull", "-B"])
+if not os.path.isdir("po"):
+    os.mkdir("po")
+
+with urllib.request.urlopen("https://translate.zanata.org/rest/project/windynamicdesktop/") as fileobj:
+    iteration_slug = json.load(fileobj)["iterations"][0]["id"]
+
+for name in LOCALE_MAPPING.keys():
+    url_name = name.replace("_", "-")
+    print(f"Downloading translation for {url_name}")
+    urllib.request.urlretrieve(f"https://translate.zanata.org/rest/file/translation/windynamicdesktop/{iteration_slug}/{url_name}/po?docId=messages", f"po/{name}.po")
 
 for filename in glob.glob("../src/locale/*.mo"):
     os.remove(filename)

diff --git a/i18n/zanata.xml b/i18n/zanata.xml
diff --git a/src/ImportDialog.cs b/src/ImportDialog.cs
@@ -61,14 +61,10 @@ private void ImportNext()
                 this.Invoke(new Action(() =>
                     label1.Text = string.Format(_("Importing theme from {0}..."),
                     Path.GetFileName(themePath))));
-                ThemeResult maybeResult = ThemeManager.ImportTheme(themePath);
-
-                if (maybeResult != null)
-                {
-                    maybeResult.Match(e => this.Invoke(new Action(
-                        () => ThemeLoader.HandleError(e))),
-                        theme => ThemeManager.importedThemes.Add(theme));
-                }
+
+                ThemeResult result = ThemeManager.ImportTheme(themePath);
+                result.Match(e => this.Invoke(new Action(() => ThemeLoader.HandleError(e))),
+                    theme => ThemeManager.importedThemes.Add(theme));
 
                 importQueue.Dequeue();
                 ImportNext();

diff --git a/src/Localization.cs b/src/Localization.cs
@@ -26,6 +26,7 @@ class Localization
             "Français",  // French
             "Eλληνικά",  // Greek
             "Italiano",  // Italian
+            "Македонски",  // Macedonian
             "Polski",  // Polish
             "Română",  // Romanian
             "Pусский",  // Russian
@@ -34,7 +35,7 @@ class Localization
         };
 
         public static string[] localeNames = new string[] { "cs_CZ", "de_DE", "en_US", "es_ES",
-            "fr_FR", "el_GR", "it_IT", "pl_PL", "ro_RO", "ru_RU", "tr_TR", "zh_CN" };
+            "fr_FR", "el_GR", "it_IT", "mk_MK", "pl_PL", "ro_RO", "ru_RU", "tr_TR", "zh_CN" };
 
         public static string currentLocale;
         private static ICatalog moCatalog = null;
@@ -114,6 +115,7 @@ private static void LoadLocaleFromWeb()
         {
             using (WebClient wc = new WebClient())
             {
+                wc.Encoding = Encoding.UTF8;
                 string poText = wc.DownloadString(currentLocale);
                 POParser parser = new POParser();
                 poCatalog = parser.Parse(poText).Catalog;
@@ -134,7 +136,8 @@ public static string GetTranslation(string msg)
             }
             else if (poCatalog != null)
             {
-                return poCatalog.GetTranslation(new POKey(msg));
+                string translated = poCatalog.GetTranslation(new POKey(msg));
+                return string.IsNullOrEmpty(translated) ? msg : translated;
             }
 
             return msg;
@@ -149,6 +152,7 @@ private static IEnumerable<Control> GetControls(Control form)
                 {
                     yield return grandChild;
                 }
+
                 yield return childControl;
             }
         }

diff --git a/src/MainMenu.cs b/src/MainMenu.cs
@@ -46,7 +46,7 @@ private static List<ToolStripItem> GetMenuItems()
             });
             items[0].Enabled = false;
 
-            darkModeItem = new ToolStripMenuItem(_("&Night wallpaper only mode"), null, OnDarkModeClick);
+            darkModeItem = new ToolStripMenuItem(_("&Night Wallpaper Only Mode"), null, OnDarkModeClick);
             darkModeItem.Checked = JsonConfig.settings.darkMode;
             startOnBootItem = new ToolStripMenuItem(_("&Start on Boot"), null, OnStartOnBootClick);
 
@@ -79,10 +79,10 @@ private static List<ToolStripItem> GetOptionsMenuItems()
 
             if (BrightnessController.IsDDCSupported)
             {
+                items.Add(new ToolStripSeparator());
                 items.Add(new ToolStripMenuItem(_("Set Auto Brightness"), null, OnSetAutoBrightnessItemClick));
             }
 
-            items.Add(new ToolStripSeparator());
             items.AddRange(SystemThemeChanger.GetMenuItems());
             items.AddRange(WallpaperCompressionChanger.GetMenuItems());
             items.AddRange(UpdateChecker.GetMenuItems());

diff --git a/src/Properties/Resources.Designer.cs b/src/Properties/Resources.Designer.cs
diff --git a/src/Properties/Resources.resx b/src/Properties/Resources.resx
@@ -163,4 +163,7 @@
   <data name="locale_tr_TR" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\locale\tr_TR.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="locale_mk_MK" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\locale\mk_MK.mo;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
diff --git a/src/SystemThemeChanger.cs b/src/SystemThemeChanger.cs
@@ -45,9 +45,9 @@ public static List<ToolStripItem> GetMenuItems()
             automaticAppThemeItem.Checked = JsonConfig.settings.changeAppTheme;
 
             return new List<ToolStripItem>() {
-                automaticSystemThemeItem,
-                automaticAppThemeItem,
                 new ToolStripSeparator(),
+                automaticSystemThemeItem,
+                automaticAppThemeItem
             };
         }
 

diff --git a/src/ThemeDialog.Designer.cs b/src/ThemeDialog.Designer.cs
diff --git a/src/ThemeDialog.cs b/src/ThemeDialog.cs
@@ -46,10 +46,37 @@ public ThemeDialog()
 
         public void ImportThemes(List<string> themePaths)
         {
+            this.Enabled = false;
+            List<string> duplicateThemeNames = new List<string>();
+
+            foreach (string themePath in themePaths)
+            {
+                string themeId = Path.GetFileNameWithoutExtension(themePath);
+                int themeIndex = ThemeManager.themeSettings.FindIndex(t => t.themeId == themeId);
+
+                if (themeIndex != -1)
+                {
+                    duplicateThemeNames.Add(ThemeManager.GetThemeName(
+                        ThemeManager.themeSettings[themeIndex]));
+                }
+            }
+
+            if (duplicateThemeNames.Count > 0)
+            {
+                DialogResult result = MessageDialog.ShowQuestion(string.Format(_("The following " +
+                    "themes are already installed:\n\t{0}\n\nDo you want to overwrite them?"),
+                    string.Join("\n\t", duplicateThemeNames)), _("Question"), true);
+
+                if (result != DialogResult.Yes)
+                {
+                    this.Enabled = true;
+                    return;
+                }
+            }
+
             ImportDialog importDialog = new ImportDialog() { Owner = this };
             importDialog.FormClosing += OnImportDialogClosing;
             importDialog.Show();
-            this.Enabled = false;
             importDialog.InitImport(themePaths);
         }
 

diff --git a/src/ThemeManager.cs b/src/ThemeManager.cs
@@ -121,17 +121,6 @@ public static ThemeResult ImportTheme(string importPath)
             int themeIndex = themeSettings.FindIndex(t => t.themeId == themeId);
             ThemeResult result;
 
-            if (themeIndex != -1)
-            {
-                bool shouldOverwrite = ThemeLoader.PromptDialog(string.Format(_("The '{0}' " +
-                    "theme is already installed. Do you want to overwrite it?"), themeId));
-
-                if (!shouldOverwrite)
-                {
-                    return null;  // TODO Update when nullable reference types are supported
-                }
-            }
-
             if (Path.GetExtension(importPath) != ".json")
             {
                 result = ThemeLoader.ExtractTheme(importPath, themeId);

diff --git a/src/UpdateChecker.cs b/src/UpdateChecker.cs
@@ -59,6 +59,7 @@ public static List<ToolStripItem> GetMenuItems()
                 menuItem.Checked = !JsonConfig.settings.disableAutoUpdate;
 
                 return new List<ToolStripItem>() {
+                    new ToolStripSeparator(),
                     menuItem
                 };
             }

diff --git a/src/WallpaperCompressionChanger.cs b/src/WallpaperCompressionChanger.cs
@@ -39,8 +39,8 @@ public static List<ToolStripItem> GetMenuItems()
             compressionTweakItem.Checked = isWallpaperCompressionTweaked;
 
             return new List<ToolStripItem>() {
-                compressionTweakItem,
-                new ToolStripSeparator()
+                new ToolStripSeparator(),
+                compressionTweakItem
             };
         }
 

diff --git a/src/WinDynamicDesktop.csproj b/src/WinDynamicDesktop.csproj
@@ -212,6 +212,7 @@
     <None Include="locale\es_ES.mo" />
     <None Include="locale\fr_FR.mo" />
     <None Include="locale\it_IT.mo" />
+    <None Include="locale\mk_MK.mo" />
     <None Include="locale\pl_PL.mo" />
     <None Include="locale\ro_RO.mo" />
     <None Include="locale\ru_RU.mo" />

diff --git a/src/locale/cs_CZ.mo b/src/locale/cs_CZ.mo
diff --git a/src/locale/de_DE.mo b/src/locale/de_DE.mo
diff --git a/src/locale/el_GR.mo b/src/locale/el_GR.mo
diff --git a/src/locale/es_ES.mo b/src/locale/es_ES.mo
diff --git a/src/locale/fr_FR.mo b/src/locale/fr_FR.mo
diff --git a/src/locale/it_IT.mo b/src/locale/it_IT.mo
diff --git a/src/locale/mk_MK.mo b/src/locale/mk_MK.mo
diff --git a/src/locale/pl_PL.mo b/src/locale/pl_PL.mo
diff --git a/src/locale/ro_RO.mo b/src/locale/ro_RO.mo
diff --git a/src/locale/ru_RU.mo b/src/locale/ru_RU.mo
diff --git a/src/locale/tr_TR.mo b/src/locale/tr_TR.mo
diff --git a/src/locale/zh_CN.mo b/src/locale/zh_CN.mo