Changeset 1794

Timestamp:

2/10/2010 7:11:27 AM (3 years ago)

Author:

lowjoel

Message:

Removed the Language and LanguageManager? classes since the former is just CultureInfo?, and the latter should really be in the "S" class. Addresses #276: Implement Eraser Registrar Interface

Location:

branches/eraser6/CodeReview

Files:

• Eraser.Manager/Eraser.Manager.csproj (modified) (1 diff)
• Eraser.Manager/Language.cs (deleted)
• Eraser.Util/Localisation.cs (modified) (1 diff)
• Eraser/SettingsPanel.cs (modified) (7 diffs)

branches/eraser6/CodeReview/Eraser.Manager/Eraser.Manager.csproj

@@ -71 +71 @@
     <Compile Include="FileSystem.cs" />
     <Compile Include="IRegistrar.cs" />
-    <Compile Include="Language.cs" />
     <Compile Include="ManagerLibrary.cs" />
     <Compile Include="Method.cs" />

branches/eraser6/CodeReview/Eraser.Util/Localisation.cs

@@ -167 +167 @@
                 Path.Combine(Path.GetDirectoryName(assembly.Location), culture.Name), //Directory
                 Path.GetFileNameWithoutExtension(assembly.Location) + ".resources.dll"));
+        }
+
+        /// <summary>
+        /// Retrieves all present language plugins
+        /// </summary>
+        /// <returns>A list, with an instance of each Language class</returns>
+        public static IList<CultureInfo> Localisations
+        {
+            get
+            {
+                List<CultureInfo> result = new List<CultureInfo>();
+                Assembly assembly = Assembly.GetEntryAssembly();
+                foreach (CultureInfo info in CultureInfo.GetCultures(CultureTypes.AllCultures))
+                {
+                    if (string.IsNullOrEmpty(info.Name))
+                        continue;
+                    else if (LocalisationExists(info, assembly))
+                        result.Add(info);
+                }
+
+                //Last resort
+                if (result.Count == 0)
+                    result.Add(CultureInfo.GetCultureInfo("EN"));
+                return result.AsReadOnly();
+            }
         }
 

branches/eraser6/CodeReview/Eraser/SettingsPanel.cs

@@ -125 +125 @@
 
             //Refresh the list of languages
-            IList<Language> languages = LanguageManager.Items;
-            foreach (Language culture in languages)
+            IList<CultureInfo> languages = S.Localisations;
+            foreach (CultureInfo culture in languages)
                 uiLanguage.Items.Add(culture);
 
@@ -145 +145 @@
         {
             EraserSettings settings = EraserSettings.Get();
-            foreach (Object lang in uiLanguage.Items)
-                if (((Language)lang).Name == settings.Language)
+            foreach (CultureInfo lang in uiLanguage.Items)
+                if (lang.Name == settings.Language)
                 {
                     uiLanguage.SelectedItem = lang;
@@ -152 +152 @@
                 }
 
-            foreach (Object method in eraseFilesMethod.Items)
-                if (((ErasureMethod)method).Guid == ManagerLibrary.Settings.DefaultFileErasureMethod)
+            foreach (ErasureMethod method in eraseFilesMethod.Items)
+                if (method.Guid == ManagerLibrary.Settings.DefaultFileErasureMethod)
                 {
                     eraseFilesMethod.SelectedItem = method;
@@ -159 +159 @@
                 }
 
-            foreach (Object method in eraseUnusedMethod.Items)
-                if (((ErasureMethod)method).Guid == ManagerLibrary.Settings.DefaultUnusedSpaceErasureMethod)
+            foreach (ErasureMethod method in eraseUnusedMethod.Items)
+                if (method.Guid == ManagerLibrary.Settings.DefaultUnusedSpaceErasureMethod)
                 {
                     eraseUnusedMethod.SelectedItem = method;
@@ -166 +166 @@
                 }
 
-            foreach (Object prng in erasePRNG.Items)
-                if (((Prng)prng).Guid == ManagerLibrary.Settings.ActivePrng)
+            foreach (Prng prng in erasePRNG.Items)
+                if (prng.Guid == ManagerLibrary.Settings.ActivePrng)
                 {
                     erasePRNG.SelectedItem = prng;
@@ -193 +193 @@
             if (uiLanguage.SelectedIndex == -1)
             {
-                foreach (Object lang in uiLanguage.Items)
-                    if (((Language)lang).Name == "en")
+                foreach (CultureInfo lang in uiLanguage.Items)
+                    if (lang.Name == "en")
                     {
                         uiLanguage.SelectedItem = lang;
@@ -405 +405 @@
             }
 
-            if (CultureInfo.CurrentUICulture.Name != ((Language)uiLanguage.SelectedItem).Name)
-            {
-                settings.Language = ((Language)uiLanguage.SelectedItem).Name;
+            if (CultureInfo.CurrentUICulture.Name != ((CultureInfo)uiLanguage.SelectedItem).Name)
+            {
+                settings.Language = ((CultureInfo)uiLanguage.SelectedItem).Name;
                 MessageBox.Show(this, S._("The new UI language will take only effect when " +
                     "Eraser is restarted."), S._("Eraser"), MessageBoxButtons.OK,