中英文修改

source/ACSingleStore/ACSingleStore.csproj

@@ -177,6 +177,9 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     </Compile>
+    <None Include="resource\ResourceMap.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <None Include="App.config">
     <None Include="App.config">

source/ACSingleStore/ResourceCulture.cs

@@ -82,11 +82,26 @@ namespace OnlineStore
                             {
                             {
                                 eng = array[2].Replace('&', ',').Trim();
                                 eng = array[2].Replace('&', ',').Trim();
                             }
                             }
+                            if (ChinaMap.ContainsKey(key))
+                            {
+                                ChinaMap[key] = china;
+                            }
+                            else
+                            {
                                 ChinaMap.Add(key, china);
                                 ChinaMap.Add(key, china);
+                            }
                             if (String.IsNullOrEmpty(eng).Equals(false))
                             if (String.IsNullOrEmpty(eng).Equals(false))
                             {
                             {
+                                if (EnglishMap.ContainsKey(key))
+                                {
+                                    EnglishMap[key] = eng;
+                                }
+                                else
+                                {
                                     EnglishMap.Add(key, eng);
                                     EnglishMap.Add(key, eng);
                                 }
                                 }
+                             //   EnglishMap.Add(key, eng);
+                            }
                         }
                         }
                     }catch(Exception ex)
                     }catch(Exception ex)
                     {
                     {
@@ -170,7 +185,13 @@ namespace OnlineStore
                     {
                     {
                         if (array.Length >= 3)
                         if (array.Length >= 3)
                         {
                         {
-                            map.Add(array[1].Replace('&', ',').Trim(), array[2].Replace('&', ',').Trim());
+                            string key = array[1].Replace('&', ',').Trim();
+                            string value = array[2].Replace('&', ',').Trim();
+                            if (map.ContainsKey(key))
+                            {
+                                map[key] = value;
+                            }
+                            else { map.Add(key, value); }
                         }
                         }
                     }
                     }
                     catch (Exception ex)
                     catch (Exception ex)