Merge branch 'master' of https://github.com/Zharay/KanColleViewer

yuyuvn · Mar 23, 2014 · 48cea6e · 48cea6e
2 parents 6f84ad0 + cea091f
commit 48cea6e
Show file tree

Hide file tree

Showing 11 changed files with 234 additions and 42 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -2,6 +2,12 @@
 	KCV Change Log
 ========================
 
+v2.4.0 r370 - 3/21/2014 [BATTLECRUISER OPERATIONAL]
+	* Fast battleship types have been given a new hull type - CC. This stands for
+		Battlecruiser (a fast battleship with lighter armor).
+	* Ship types have been fixed up (AVs and CVs have been separated)
+	* Ship List filter buttons have had some ship types added to fill in the gaps.
+
 v2.4.0 r364 - 3/20/2014
 Merge from the original KCV (Grabacr07):
 	* Overview page now allows the user to switch between fleets and see their status.

diff --git a/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -51,4 +51,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.364")]
+[assembly: AssemblyVersion("2.4.0.370")]
diff --git a/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -163,8 +163,9 @@
 								<!-- これっきりボタン -->
 								<metro2:CallMethodButton Content="Destroyers">
 									<metro2:CallMethodButton.MethodParameter>
-										<x:Array Type="s:Int32">
-											<s:Int32>2</s:Int32>
+                                        <x:Array Type="s:Int32">
+                                            <s:Int32>1</s:Int32>
+                                            <s:Int32>2</s:Int32>
 										</x:Array>
 									</metro2:CallMethodButton.MethodParameter>
 								</metro2:CallMethodButton>
@@ -216,6 +217,7 @@
 										<x:Array Type="s:Int32">
 											<s:Int32>6</s:Int32>
 											<s:Int32>10</s:Int32>
+											<s:Int32>16</s:Int32>
 										</x:Array>
 									</metro2:CallMethodButton.MethodParameter>
 								</metro2:CallMethodButton>

diff --git a/Grabacr07.KanColleWrapper/Models/ShipType.cs b/Grabacr07.KanColleWrapper/Models/ShipType.cs
@@ -23,7 +23,7 @@ public string Name
 		{
 			get
 			{
-				return KanColleClient.Current.Homeport.Translations.GetTranslation(RawData.api_name, TranslationType.ShipTypes, this.RawData);
+				return KanColleClient.Current.Homeport.Translations.GetTranslation(RawData.api_name, TranslationType.ShipTypes, this.RawData, this.Id);
 			}
 		}
 

diff --git a/Grabacr07.KanColleWrapper/Translations.cs b/Grabacr07.KanColleWrapper/Translations.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -236,7 +237,7 @@ private IEnumerable<XElement> GetTranslationList(TranslationType Type)
             return null;
         }
 
-        public string GetTranslation(string JPString, TranslationType Type, Object RawData)
+        public string GetTranslation(string JPString, TranslationType Type, Object RawData, int ID = -1)
         {
             if (!EnableTranslations || CurrentCulture == "ja-JP")
                 return JPString;
@@ -263,7 +264,20 @@ public string GetTranslation(string JPString, TranslationType Type, Object RawDa
                 IEnumerable<XElement> FoundTranslation = TranslationList.Where(b => b.Element(JPChildElement).Value.Equals(JPString));
 
                 foreach (XElement el in FoundTranslation)
-                    return el.Element(TRChildElement).Value;
+                {
+#if DEBUG
+                    if (ID >= 0 && el.Element("ID") != null && Convert.ToInt32(el.Element("ID").Value) == ID)
+                        Debug.WriteLine(string.Format("Translation: {0,-20} {1,-20} {2}", JPString, el.Element(TRChildElement).Value, ID));
+#endif
+                    if (ID >= 0 && el.Element("ID") != null && Convert.ToInt32(el.Element("ID").Value) == ID)
+                        return el.Element(TRChildElement).Value;
+                    else if (ID < 0)
+                        return el.Element(TRChildElement).Value;
+
+                }
+#if DEBUG
+                Debug.WriteLine(string.Format("Can't find Translation: {0,-20} {1}", JPString, ID));
+#endif
             }
             catch { }
 
@@ -318,6 +332,7 @@ public void AddTranslation(Object RawData, TranslationType Type)
                             return;
 
                         ShipTypesXML.Root.Add(new XElement("Type",
+                            new XElement("ID", TypeData.api_id),
                             new XElement("JP-Name", TypeData.api_name),
                             new XElement("TR-Name", TypeData.api_name)
                             ));

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ All builds can be found in the following links below.
 Before or after logging in, press the "Set Regional Cookie" button. This will change your status from being an IP from outside Japan to being a Japanese native one. It doesn't change your IP or do anything else except change a flag value on your visitor cookie.
 
 #### Is this cookie safe?
-By all means it is. But it does mean that it makes playing Kancolle a ton more easier for regions that DMM does not support. From their twitter responses, they are alright with foreigners playing the game, but they will not provide any support for those outside of Japan. Until they change this rather open method of delegating foreigners from non-foreigners, this is probably the easiest way to play (and possible register for) the game itself.
+By all means it is. But it does mean that it makes playing Kancolle a ton easier for regions that DMM does not support. From their twitter responses, they are alright with foreigners playing the game, but they will not provide any support for those outside of Japan. Until they change this rather open method of delegating foreigners from non-foreigners, this is probably the easiest way to play (and possibly register for) the game itself.
 
 #### My game is choppy when it plays fine in Chrome/Firefox/Flash Projector
 Update Internet Explorer to the latest version available for your build of Windows. Windows 7 can go all the way to [Internet Explorer 11](http://windows.microsoft.com/en-us/internet-explorer/ie-11-worldwide-languages) which is by far the fastest version of IE they've made in years.
@@ -39,7 +39,10 @@ Install [Flash for Internet Explorer](http://get.adobe.com/flashplayer/othervers
 You need to have [.NET Framework 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653) installed for your version of Windows. Those on Windows 8 do not have to do this.
 
 #### I want the original Japanese names for ships/items/etc.
-Easiest way is to just delete the text file corrisponding to the things you don't wish to be translated. You are also encouraged to use the [original version of KCV](http://grabacr.net/kancolleviewer) as it has an english UI now.
+Easiest way is to just disable translations in the options menu. You can also set the UI's language to Japanese which will disable all translations by default. If you only want certain things translated, deleting the corresponding XML file in the translation folder is your best bet (just be sure to disable auto update).
+
+#### I'm mising XXXX translations! (XXXX is in Japanese)
+Please help me with these when you run into them. The translation engine has the ability to add untranslated text to the corresponding XML file found in translations. Find the untranslated parts at the bottom of the list and message it to me through pastebin on twitter (@Zharay) or as a bug in GitHub.
 
 #### What is the difference between this and the original?
 * Horizontal version is unique to this project. 

diff --git a/resources/Version.xml b/resources/Version.xml
@@ -2,8 +2,8 @@
 <Versions>
 	<Item>
 		<Name>App</Name>
-		<Version>2.4.0.364</Version>
-		<URL>https://github.com/yuyuvn/KanColleViewer/releases/tag/v2.4.0r364</URL>
+		<Version>2.4.0.370</Version>
+		<URL>https://github.com/yuyuvn/KanColleViewer/releases/tag/v2.4.0r370</URL>
 	</Item>
 	<Item>
 		<Name>Equipment</Name>
@@ -22,12 +22,12 @@
 	</Item>
 	<Item>
 		<Name>Ships</Name>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/Ships.xml</URL>
 	</Item>
 	<Item>
 		<Name>ShipTypes</Name>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/ShipTypes.xml</URL>
 	</Item>
 </Versions>
diff --git a/resources/Version.xml.orig b/resources/Version.xml.orig
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Versions>
+	<Item>
+		<Name>App</Name>
+<<<<<<< HEAD
+		<Version>2.4.0.364</Version>
+		<URL>https://github.com/yuyuvn/KanColleViewer/releases/tag/v2.4.0r364</URL>
+=======
+		<Version>2.4.0.370</Version>
+		<URL>https://github.com/Zharay/KanColleViewer/releases/tag/v2.4.0r370</URL>
+>>>>>>> cea091f38aec302768437ddeeb90a8285f564725
+	</Item>
+	<Item>
+		<Name>Equipment</Name>
+		<Version>1.0.0</Version>
+		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/Equipment.xml</URL>
+	</Item>
+	<Item>
+		<Name>Operations</Name>
+		<Version>1.0.1</Version>
+		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/Operations.xml</URL>
+	</Item>
+	<Item>
+		<Name>Quests</Name>
+		<Version>1.0.0</Version>
+		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/Quests.xml</URL>
+	</Item>
+	<Item>
+		<Name>Ships</Name>
+		<Version>1.0.1</Version>
+		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/Ships.xml</URL>
+	</Item>
+	<Item>
+		<Name>ShipTypes</Name>
+		<Version>1.0.1</Version>
+		<URL>https://raw.github.com/Zharay/KanColleViewer/master/resources/translations/ShipTypes.xml</URL>
+	</Item>
+</Versions>
diff --git a/resources/translations/ShipTypes.xml b/resources/translations/ShipTypes.xml
@@ -1,71 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ShipTypes Version="1.0.0">
+<ShipTypes Version="1.0.1">
   <Type>
-    <JP-Name>水上機母艦</JP-Name>
-    <TR-Name>AV</TR-Name>
+    <ID>1</ID>
+    <JP-Name>海防艦</JP-Name>
+    <TR-Name>DE</TR-Name>
   </Type>
   <Type>
-    <JP-Name>戦艦</JP-Name>
-    <TR-Name>BB</TR-Name>
+    <ID>2</ID>
+    <JP-Name>駆逐艦</JP-Name>
+    <TR-Name>DD</TR-Name>
   </Type>
   <Type>
-    <JP-Name>航空戦艦</JP-Name>
-    <TR-Name>BBV</TR-Name>
+    <ID>3</ID>
+    <JP-Name>軽巡洋艦</JP-Name>
+    <TR-Name>CL</TR-Name>
   </Type>
   <Type>
+    <ID>4</ID>
+    <JP-Name>重雷装巡洋艦</JP-Name>
+    <TR-Name>CLT</TR-Name>
+  </Type>
+  <Type>
+    <ID>5</ID>
     <JP-Name>重巡洋艦</JP-Name>
     <TR-Name>CA</TR-Name>
   </Type>
   <Type>
+    <ID>6</ID>
     <JP-Name>航空巡洋艦</JP-Name>
     <TR-Name>CAV</TR-Name>
   </Type>
   <Type>
-    <JP-Name>軽巡洋艦</JP-Name>
-    <TR-Name>CL</TR-Name>
+    <ID>7</ID>
+    <JP-Name>軽空母</JP-Name>
+    <TR-Name>CVL</TR-Name>
   </Type>
   <Type>
-    <JP-Name>重雷装巡洋艦</JP-Name>
-    <TR-Name>CLT</TR-Name>
+    <ID>9</ID>
+    <JP-Name>戦艦</JP-Name>
+    <TR-Name>BB</TR-Name>
   </Type>
   <Type>
-    <JP-Name>正規空母</JP-Name>
-    <TR-Name>CV</TR-Name>
+    <ID>8</ID>
+    <JP-Name>戦艦</JP-Name>
+    <TR-Name>CC</TR-Name>
   </Type>
   <Type>
-    <JP-Name>軽空母</JP-Name>
-    <TR-Name>CVL</TR-Name>
+    <ID>10</ID>
+    <JP-Name>航空戦艦</JP-Name>
+    <TR-Name>BBV</TR-Name>
   </Type>
   <Type>
-    <JP-Name>駆逐艦</JP-Name>
-    <TR-Name>DD</TR-Name>
+    <ID>11</ID>
+    <JP-Name>正規空母</JP-Name>
+    <TR-Name>CV</TR-Name>
+  </Type>
+  <Type>
+    <ID>12</ID>
+    <JP-Name>超弩級戦艦</JP-Name>
+    <TR-Name>B</TR-Name>
   </Type>
   <Type>
+    <ID>13</ID>
     <JP-Name>潜水艦</JP-Name>
     <TR-Name>SS</TR-Name>
   </Type>
   <Type>
+    <ID>14</ID>
     <JP-Name>潜水空母</JP-Name>
     <TR-Name>SSV</TR-Name>
   </Type>
   <Type>
-    <JP-Name>装甲空母</JP-Name>
-    <TR-Name>CVB</TR-Name>
-  </Type>
-  <Type>
-    <JP-Name>揚陸艦</JP-Name>
-    <TR-Name>LHA</TR-Name>
+    <ID>15</ID>
+    <JP-Name>補給艦</JP-Name>
+    <TR-Name>AE</TR-Name>
   </Type>
   <Type>
-    <JP-Name>海防艦</JP-Name>
-    <TR-Name>DE</TR-Name>
+    <ID>16</ID>
+    <JP-Name>水上機母艦</JP-Name>
+    <TR-Name>AV</TR-Name>
   </Type>
   <Type>
-    <JP-Name>超弩級戦艦</JP-Name>
-    <TR-Name>B</TR-Name>
+    <ID>17</ID>
+    <JP-Name>揚陸艦</JP-Name>
+    <TR-Name>LSD</TR-Name>
   </Type>
   <Type>
-    <JP-Name>補給艦</JP-Name>
-    <TR-Name>AE</TR-Name>
+    <ID>18</ID>
+    <JP-Name>装甲空母</JP-Name>
+    <TR-Name>CVB</TR-Name>
   </Type>
 </ShipTypes>
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ public string Name @@
     		{
     			get
     			{
-    				return KanColleClient.Current.Homeport.Translations.GetTranslation(RawData.api_name, TranslationType.ShipTypes, this.RawData);
+    				return KanColleClient.Current.Homeport.Translations.GetTranslation(RawData.api_name, TranslationType.ShipTypes, this.RawData, this.Id);
     			}
     		}
@@ Expand Down @@