fix bug Languages.xml

DOG729 · Jun 14, 2021 · bc739f8 · bc739f8
1 parent c0ceefd
commit bc739f8
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1,226 deletions.
diff --git a/ru/Modules/Russian/GUI/Fonts/Galahad/Galahad.bfnt b/ru/Modules/Russian/GUI/Fonts/Galahad/Galahad.bfnt
diff --git a/ru/Modules/Russian/GUI/Fonts/Galahad/Galahad.fnt b/ru/Modules/Russian/GUI/Fonts/Galahad/Galahad.fnt
diff --git a/ru/Modules/Russian/GUI/Fonts/Galahad_mount&blade_0.ttf b/ru/Modules/Russian/GUI/Fonts/Galahad_mount&blade_0.ttf
diff --git a/ru/Modules/Russian/GUI/Fonts/Languages.xml b/ru/Modules/Russian/GUI/Fonts/Languages.xml
@@ -1,10 +1,12 @@
-<Languages DefaultLanguage="Русский">
+<!--Maps English fonts to Foreign fonts to use on language change-->
+
+<Languages DefaultLanguage="Pусский">
   <!--NewlineDoesntRequireSpace: Parsers will not look for an empty space for splitting a new line-->
   <!--ForbiddenStartOfLineCharacters: Parsers will try NOT to put these characters defined in this attribute at the START of new lines. Will not be used if Language doesn't include NewlineDoesntRequireSpace attribute-->
   <!--ForbiddenEndOfLineCharacters: Parsers will try NOT to put these characters defined in this attribute at the END of new lines. Will not be used if Language doesn't include NewlineDoesntRequireSpace attribute-->
 
-  <!-- Русский -->
-  <Language id="Русский" DefaultFont="FiraSansExtraCondensed-Regular">
+  <!-- English -->
+  <Language id="English" DefaultFont="FiraSansExtraCondensed-Regular">
     <Map From="FiraSansExtraCondensed-Light" To="FiraSansExtraCondensed-Light"/>
     <Map From="FiraSansExtraCondensed-Medium" To="FiraSansExtraCondensed-Medium"/>
     <Map From="FiraSansExtraCondensed-Regular" To="FiraSansExtraCondensed-Regular"/>
@@ -91,14 +93,15 @@
   </Language>
 
   <!-- Russian -->
-  <Language id="Русский" DefaultFont="FiraSansExtraCondensed-Regular">
+  <Language id="Pусский" DefaultFont="FiraSansExtraCondensed-Regular">
     <Map From="FiraSansExtraCondensed-Light" To="FiraSansExtraCondensed-Light"/>
     <Map From="FiraSansExtraCondensed-Medium" To="FiraSansExtraCondensed-Medium"/>
     <Map From="FiraSansExtraCondensed-Regular" To="FiraSansExtraCondensed-Regular"/>
     <Map From="Galahad" To="FiraSansExtraCondensed-Regular"/>
     <Map From="Galahad_Numbers_Bold" To="Galahad_Numbers_Bold"/>
   </Language>
-
+
+
   <Language id="dev_russian" DefaultFont="FiraSansExtraCondensed-Regular">
     <Map From="FiraSansExtraCondensed-Light" To="FiraSansExtraCondensed-Light"/>
     <Map From="FiraSansExtraCondensed-Medium" To="FiraSansExtraCondensed-Medium"/>
@@ -142,4 +145,14 @@
     <Map From="Galahad" To="Galahad"/>
     <Map From="Galahad_Numbers_Bold" To="Galahad_Numbers_Bold"/>
   </Language>
-</Languages>
+
+  <!-- Dingbat -->
+  <!--DingBat(in general, symbols) need to be defined as a separate language in their own-->
+  <Language id="Dingbat" DefaultFont="FreeSerif-Dingbat">
+    <Map From="FiraSansExtraCondensed-Light" To="FiraSansExtraCondensed-Light"/>
+    <Map From="FiraSansExtraCondensed-Medium" To="FiraSansExtraCondensed-Medium"/>
+    <Map From="FiraSansExtraCondensed-Regular" To="FiraSansExtraCondensed-Regular"/>
+    <Map From="Galahad" To="Galahad"/>
+    <Map From="Galahad_Numbers_Bold" To="Galahad_Numbers_Bold"/>
+  </Language>
+</Languages>
diff --git a/ru/Modules/Russian/GUI/Fonts/Russian/Russian.fnt b/ru/Modules/Russian/GUI/Fonts/Russian/Russian.fnt
diff --git a/ru/Modules/Russian/GUI/Fonts/Russian/Russian.png b/ru/Modules/Russian/GUI/Fonts/Russian/Russian.png
diff --git a/ru/Modules/Russian/SubModule.xml b/ru/Modules/Russian/SubModule.xml
@@ -2,17 +2,17 @@
 <Module>
 	<Name value = "Russian by DOG729"/>
 	<Id value = "Russian"/>
-	<Version value = "e1.5.6"/>
-	<VersionNative value = "e1.5.9"/>
+	<Version value = "e1.5.9"/>
 	<DefaultModule value="true"/>
 	<SingleplayerModule value="true"/>
-	<MultiplayerModule value="true"/>
+	<MultiplayerModule value="false"/>
 	<Author value="DOG729" />
   	<Official value="false" />
 	<DependedModules>
-		<DependedModule Id="Native"/>
-		<DependedModule Id="SandBoxCore"/>
-		<DependedModule Id="Sandbox"/>
+		<DependedModule Id="Native" DependentVersion="e1.6.0"/>
+		<DependedModule Id="SandBoxCore" DependentVersion="e1.6.0"/>
+		<DependedModule Id="Sandbox" DependentVersion="e1.6.0"/>
+		<DependedModule Id="StoryMode" DependentVersion="e1.6.0"/>
 	</DependedModules>
 	<SubModules/>
 	<Xmls>