Fixed missing rings in forum export. Added partial GUI translation.

animalnots · Jun 18, 2015 · c75f0f9 · c75f0f9
1 parent 03df163
commit c75f0f9
Show file tree

Hide file tree

Showing 33 changed files with 428 additions and 141 deletions.
diff --git a/ForumExportTemplate.txt b/ForumExportTemplate.txt
@@ -0,0 +1,138 @@
+Добро пожаловать! (Последнее обновление {LastUpdated}),
+
+Пожалуйста, свяжитесь со мной здесь или в игре если вас что-нибудь заинтересовало. Мой ник в игре {IGN}.
+
+[spoiler="          Уникальные вещи          "]
+{Uniques}
+[/spoiler]
+[spoiler="          5-Связ          "]
+{5Link}
+[/spoiler]
+[spoiler="          6-Связ          "]
+{6Link}
+[/spoiler]
+[spoiler="          Карты          "]
+[spoiler="          Фрагменты ваал          "]
+{VaalFragments}
+{VaalUberFragments}
+[/spoiler]
+[spoiler="          66-69          "]
+{66Maps}{67Maps}{68Maps}{69Maps}
+[/spoiler]
+[spoiler="          70-78          "]
+{70Maps}{71Maps}{72Maps}{73Maps}{74Maps}{75Maps}{76Maps}{77Maps}{78Maps}
+[/spoiler]
+[/spoiler]
+[spoiler="          Камни навыков          "]
+[spoiler="          Качественные Камни навыков          "]
+[spoiler="          Качественные Камни навыков 1-5      "]
+{Quality1Gems}{Quality2Gems}{Quality3Gems}{Quality4Gems}{Quality5Gems}
+[/spoiler]
+[spoiler="          Качественные Камни навыков 5-10     "]
+{Quality6Gems}{Quality7Gems}{Quality8Gems}{Quality9Gems}{Quality10Gems}
+[/spoiler]
+[spoiler="          Качественные Камни навыков 10-15    "]
+{Quality11Gems}{Quality12Gems}{Quality13Gems}{Quality14Gems}{Quality15Gems}
+[/spoiler]
+[spoiler="          Качественные Камни навыков 15-20    "]
+{Quality16Gems}{Quality17Gems}{Quality18Gems}{Quality19Gems}{Quality20Gems}
+[/spoiler]
+[/spoiler]
+[spoiler="          Камни, доступные только при выпадении           "]
+{DropOnlyGems}
+[/spoiler]
+[spoiler="          Популярные Камни навыков          "]
+{PopularGems}
+[/spoiler]
+[spoiler="          Камни аур          "]
+{АураGems}
+[/spoiler]
+[spoiler="          Камни проклятий          "]
+{ПроклятьеGems}
+[/spoiler]
+[spoiler="          Камни поддержки          "]
+{ПоддержкаGems}
+[/spoiler]
+[spoiler="          Камни с опытом          "]
+{Level2Gems}{Level3Gems}{Level4Gems}{Level5Gems}{Level6Gems}{Level7Gems}{Level8Gems}{Level9Gems}{Level10Gems}{Level11Gems}{Level12Gems}{Level13Gems}{Level14Gems}{Level15Gems}{Level16Gems}{Level17Gems}{Level18Gems}{Level19Gems}{Level20Gems}
+[/spoiler]
+[spoiler="          Камни ваал          "]
+{ВаалGems}
+[/spoiler]
+[/spoiler]
+[spoiler="          2-ух сопротивлений Экипировка          "]
+{DualRes}
+[/spoiler]
+[spoiler="          3-х сопротивлений Экипировка         "]
+{TripRes}
+[/spoiler]
+[spoiler="          УРП/УКП Экипировка          "]
+{MagicFind}
+[/spoiler]
+[spoiler="          Оружие и Броня          "]
+[spoiler="          Броня                                 "]
+[spoiler="          Шлемы          "]
+{RareHelmet}
+[/spoiler]
+[spoiler="          Амулеты          "]
+{RareAmulet}
+[/spoiler]
+[spoiler="          Нагрудные доспехи          "]
+{RareChest}
+[/spoiler]
+[spoiler="          Кольца          "]
+{RareRing}
+[/spoiler]
+[spoiler="          Пояса          "]
+{RareBelt}
+[/spoiler]
+[spoiler="          Ботинки          "]
+{RareBoots}
+[/spoiler]
+[spoiler="          Перчатки          "]
+{RareGloves}
+[/spoiler]
+[/spoiler]
+[spoiler="          Щиты          "]
+{RareShield}
+[/spoiler]
+[spoiler="          Мечи, Топоры & Булавы          "]
+{RareSword}
+{RareAxe}
+{RareMace}
+[/spoiler]
+[spoiler="          Кинжалы          "]
+{RareDagger}
+[/spoiler]
+[spoiler="          Когти          "]
+{RareClaw}
+[/spoiler]
+[spoiler="          Луки  & Колчаны          "]
+{RareBow}
+{RareQuiver}
+[/spoiler]
+[spoiler="          Жезлы, Скипетры & Посохи          "]
+{RareWand}
+{RareSceptre}
+{RareStaff}
+[/spoiler]
+[/spoiler]
+[spoiler="          Флаконы          "]
+[spoiler="          Обычные          "]
+{NormalFlask}
+[/spoiler]
+[spoiler="          Магические          "]
+{MagicFlask}
+[/spoiler]
+[spoiler="          Уникальные          "]
+{UniqueFlask} 
+[/spoiler]
+[/spoiler]
+[spoiler="          Валюта          "]
+{Currency} 
+[/spoiler]
+
+Спасибо за просмотр!
+
+[url=https://github.com/Stickymaddness/Procurement/][img]http://i.imgur.com/ZHBMImo.png[/img][/url]
+
diff --git a/POEApi.Infrastructure/Properties/AssemblyInfo.cs b/POEApi.Infrastructure/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2.0")]
-[assembly: AssemblyFileVersion("1.9.2.0")]
+[assembly: AssemblyVersion("1.9.3.0")]
+[assembly: AssemblyFileVersion("1.9.3.0")]
 
diff --git a/POEApi.Model/GearType/GearTypeRunner.cs b/POEApi.Model/GearType/GearTypeRunner.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 
 namespace POEApi.Model
@@ -19,7 +20,8 @@ public class GearTypeRunnerBase : GearTypeRunner
     {
         protected List<string> generalTypes;
         protected List<string> compatibleTypes;
-        protected List<string> incompatibleTypes;
+        protected List<string> incompatibleTypes;
+        protected CultureInfo culture = System.Threading.Thread.CurrentThread.CurrentCulture;
 
         public GearTypeRunnerBase(GearType gearType, IEnumerable<string> compatibleTypes)
             : base(gearType)
@@ -66,8 +68,10 @@ public RingRunner()
         }
 
         public override bool IsCompatibleType(Gear item)
-        {
-            if (item.TypeLine.Contains(Lang.RingStrValue) && !incompatibleTypes.Any(t => item.TypeLine.Contains(t)))
+        {
+            //System.Threading.Thread.CurrentThread.CurrentCulture.
+            // if (item.TypeLine.Contains(Lang.RingStrValue) && !incompatibleTypes.Any(t => item.TypeLine.Contains(t)))
+            if (culture.CompareInfo.IndexOf(item.TypeLine, Lang.RingStrValue, CompareOptions.IgnoreCase) >= 0 && !incompatibleTypes.Any(t => item.TypeLine.Contains(t)))
                 return true;
 
             return false;

diff --git a/POEApi.Model/Properties/AssemblyInfo.cs b/POEApi.Model/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2.0")]
-[assembly: AssemblyFileVersion("1.9.2.0")]
+[assembly: AssemblyVersion("1.9.3.0")]
+[assembly: AssemblyFileVersion("1.9.3.0")]
 
diff --git a/POEApi.Model/Settings.xml b/POEApi.Model/Settings.xml
@@ -69,18 +69,19 @@
     <Setting name="Password" value="" />
     <Setting name="Domain" value="" />
   </ProxySettings>
+
   <ShopSettings>
-    <Shop League="Standard" ThreadId="" ThreadTitle="" />
-    <Shop League="Hardcore" ThreadId="" ThreadTitle="" />
-    <Shop League="Bloodlines" ThreadId="" ThreadTitle="" />
-    <Shop League="Torment" ThreadId="" ThreadTitle="" />
+    <Shop League="Стандарт" ThreadId="" ThreadTitle="" />
+    <Shop League="Одна жизнь" ThreadId="" ThreadTitle="" />
+    <Shop League="Мучение/Родословные" ThreadId="" ThreadTitle="" />
+    <Shop League="Мучение/Родословные одна жизнь" ThreadId="" ThreadTitle="" />
   </ShopSettings>
   <Lists>
     <List name="MyLeagues">
-      <Item value="Standard" />
-      <Item value="Hardcore" />
-      <Item value="Torment" />
-      <Item value="Bloodlines" />
+      <Item value="Стандарт" />
+      <Item value="Одна жизнь" />
+      <Item value="Мучение/Родословные" />
+      <Item value="Мучение/Родословные одна жизнь" />
     </List>
     <List name="MyTabs">
       <!--If you only want Procurement to download specific tabs list them here, eg :-->

diff --git a/POEApi.Transport/Properties/AssemblyInfo.cs b/POEApi.Transport/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2.0")]
-[assembly: AssemblyFileVersion("1.9.2.0")]
+[assembly: AssemblyVersion("1.9.3.0")]
+[assembly: AssemblyFileVersion("1.9.3.0")]
 
 
diff --git a/Procurement/App.xaml.cs b/Procurement/App.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System.Globalization;
+using System.Windows;
 using System.Text;
 using System;
 using POEApi.Infrastructure;
@@ -9,6 +10,7 @@ public partial class App : Application
     {
         public App()
         {
+            System.Threading.Thread.CurrentThread.CurrentCulture = new CultureInfo("ru-RU");
             Application.Current.DispatcherUnhandledException += new System.Windows.Threading.DispatcherUnhandledExceptionEventHandler(Current_DispatcherUnhandledException);
         }
 

diff --git a/Procurement/ApplicationState.cs b/Procurement/ApplicationState.cs
@@ -10,7 +10,7 @@ namespace Procurement
 {
     public static class ApplicationState
     {
-        public static string Version = "Procurement 1.9.2";
+        public static string Version = "Procurement RUS 1.9.3";
         public static POEModel Model = new POEModel();
         public static Dictionary<string, Stash> Stash = new Dictionary<string, Stash>();
         public static Dictionary<string, Item> Inventory = new Dictionary<string, Item>();

diff --git a/Procurement/Controls/ForumExport.xaml b/Procurement/Controls/ForumExport.xaml
@@ -25,13 +25,13 @@
                     <RowDefinition Height="25" />
                     <RowDefinition />
                 </Grid.RowDefinitions>
-                <Label Content="Stash Tabs" Grid.Row="0"  Foreground="#FFAB9066" FontSize="14" FontWeight="Bold"/>
-                <CheckBox Grid.Row="1" Foreground="#FFAB9066" Content="Select All" Checked="ToggleAll" Unchecked="ToggleAll" Margin="10,0,0,0"/>
-                <Button Grid.Row="2" Content="Copy To Clipboard" Height="22" Width="159" Style="{Binding}" HorizontalAlignment="Left" Margin="10,0,0,0" Command="{Binding CopyCommand}"/>
+                <Label Content="Секции хранилища" Grid.Row="0"  Foreground="#FFAB9066" FontSize="14" FontWeight="Bold"/>
+                <CheckBox Grid.Row="1" Foreground="#FFAB9066" Content="Выбрать все" Checked="ToggleAll" Unchecked="ToggleAll" Margin="10,0,0,0"/>
+                <Button Grid.Row="2" Content="Скопировать в буфер" Height="22" Width="159" Style="{Binding}" HorizontalAlignment="Left" Margin="10,0,0,0" Command="{Binding CopyCommand}"/>
                 <ComboBox Grid.Row="3" Height="22"  Style="{Binding}" HorizontalAlignment="Left" Margin="10,0,0,0" ItemsSource="{Binding AvailableTemplates}" SelectedValue="{Binding CurrentTemplate, Mode=TwoWay}"/>
 
-                <Button Grid.Row="4" Content="Update Forum Thread" Height="22" Width="159" Style="{Binding}" HorizontalAlignment="Left" Margin="10,0,0,0" Command="{Binding PostToThreadCommand}" IsEnabled="{Binding LoggedIn}" />
-                <Button Grid.Row="5" Content="Bump Forum Thread" Height="22" Width="159" Style="{Binding}" HorizontalAlignment="Left" Margin="10,0,0,0" Command="{Binding BumpThreadCommand}"  IsEnabled="{Binding LoggedIn}" />
+                <Button Grid.Row="4" Content="Обновить тему на форуме" Height="22" Width="159" Style="{Binding}" HorizontalAlignment="Left" Margin="10,0,0,0" Command="{Binding PostToThreadCommand}" IsEnabled="{Binding LoggedIn}" />
+                <Button Grid.Row="5" Content="Поднять тему на форуме" Height="22" Width="159" Style="{Binding}" HorizontalAlignment="Left" Margin="10,0,0,0" Command="{Binding BumpThreadCommand}"  IsEnabled="{Binding LoggedIn}" />
 
                 <ScrollViewer Grid.Row="6" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Auto">
                    <ItemsControl ItemsSource="{Binding StashItems}" Margin="10,10,10,10" x:Name="CheckBoxList">

diff --git a/Procurement/Controls/ForumTemplate.xaml b/Procurement/Controls/ForumTemplate.xaml
@@ -15,7 +15,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <Button Content="Save All Changes" Style="{x:Null}" Width="100" Height="20" Margin="0,0,0,5" Click="Button_Click" Grid.Row="0"/>
+            <Button Content="Сохранить Все Изменения" Style="{x:Null}" Width="170" Height="20" Margin="0,0,0,5" Click="Button_Click" Grid.Row="0"/>
             <TextBox Name="TemplateText" Margin="2,5,2,5" Text="{Binding Text}" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" Background="Black" Foreground="#FFAB9066" BorderThickness="0" Grid.Row="1"/>
         </Grid>
     </Border>

diff --git a/Procurement/Controls/ItemHover.xaml b/Procurement/Controls/ItemHover.xaml
@@ -258,7 +258,7 @@
                                FontFamily="../Resources/#Fontin SmallCaps"
                                Foreground="#960003"
                                Padding="10 0 10 5"
-                               Text="Corrupted"
+                               Text="Осквернено"
                                TextAlignment="Center"
                                TextWrapping="Wrap"
                                Visibility="{Binding IsCorrupted,

diff --git a/Procurement/Controls/ItemHoverImage.xaml b/Procurement/Controls/ItemHoverImage.xaml
@@ -227,7 +227,7 @@
                                FontFamily="../Resources/#Fontin SmallCaps"
                                Foreground="#960003"
                                Padding="10 0 10 5"
-                               Text="Corrupted"
+                               Text="Осквернено"
                                TextAlignment="Center"
                                TextWrapping="Wrap"
                                Visibility="{Binding IsCorrupted,

diff --git a/Procurement/Controls/LeagueSelection.xaml b/Procurement/Controls/LeagueSelection.xaml
@@ -17,7 +17,7 @@
         <Grid.Background>
             <SolidColorBrush Color="Black" Opacity="0.8" />
         </Grid.Background>
-        <Label Content="League Selection:" Grid.Row="0"  Foreground="#FFAB9066" FontSize="14" FontWeight="Bold"/>
+        <Label Content="Выбор Лиги:" Grid.Row="0"  Foreground="#FFAB9066" FontSize="14" FontWeight="Bold"/>
         <ComboBox ItemsSource="{Binding Leagues}" Grid.Row="1" Foreground="#FFAB9066" SelectionChanged="ComboBox_SelectionChanged" SelectedItem="{Binding CurrentLeague, Mode=OneTime}" />
     </Grid>
 </UserControl>
diff --git a/Procurement/Controls/SetBuyoutView.xaml b/Procurement/Controls/SetBuyoutView.xaml
@@ -22,9 +22,9 @@
             <ColumnDefinition Width="100" />
             <ColumnDefinition Width="120" />
         </Grid.ColumnDefinitions>
-        
+
         <!--Buyouts-->
-        <CheckBox Content="Buyout" Grid.Row="0" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
+        <CheckBox Content="Выкуп" Grid.Row="0" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
         <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="0">
             <TextBox  x:Name="BuyoutValue" Height="25" Width="50" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" Text="{Binding BuyoutInfo.Value}"/>
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=BuyoutInfo.IncreaseValue}" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}"/>
@@ -33,16 +33,16 @@
         <ComboBox Grid.Column="2" Grid.Row="0" Height="25" x:Name="OrbType" IsEnabled="{Binding BuyoutInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" SelectedItem="{Binding BuyoutInfo.Orb}" />
 
         <!--Current Offer-->
-        <CheckBox Content="Offer" Grid.Row="1" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding OfferInfo.Enabled, Mode=TwoWay}"/>
+        <CheckBox Content="Актуал." Grid.Row="1" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding OfferInfo.Enabled, Mode=TwoWay}"/>
         <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
             <TextBox  x:Name="CurrentOfferValue" Height="25" Width="50" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" Text="{Binding OfferInfo.Value}"/>
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=OfferInfo.IncreaseValue}" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" />
             <Button Content="-"  Height="25" Width="20" Command="{Binding Path=OfferInfo.DecreaseValue}" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}"/>
         </StackPanel>
         <ComboBox Grid.Column="2" Grid.Row="1" Height="25" IsEnabled="{Binding OfferInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" SelectedItem="{Binding OfferInfo.Orb}"/>
-        
+
         <!--Price-->
-        <CheckBox Content="Price" Grid.Row="2" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
+        <CheckBox Content="Цена" Grid.Row="2" Foreground="#FFAB9066" FontSize="14" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
         <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
             <TextBox  x:Name="PriceValue" Height="25" Width="50" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}" Text="{Binding PriceInfo.Value}"/>
             <Button Content="+"  Height="25" Width="20" Command="{Binding Path=PriceInfo.IncreaseValue}" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}"/>
@@ -51,18 +51,18 @@
         <ComboBox Grid.Column="2" Grid.Row="2" Height="25" IsEnabled="{Binding PriceInfo.Enabled, Mode=TwoWay}" ItemsSource="{Binding OrbTypes}" SelectedItem="{Binding PriceInfo.Orb}" />
 
 
-        <TextBlock Grid.Row="3" Foreground="#FFAB9066" Text="Notes:" />
+        <TextBlock Grid.Row="3" Foreground="#FFAB9066" Text="Примечание:" />
         <TextBox x:Name="Notes" Grid.Row="4" Grid.ColumnSpan="3" Text="{Binding Notes}" VerticalScrollBarVisibility="Auto" KeyDown="TextBox_KeyDown"/>
-        
+
         <Grid Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="160" />
-                <ColumnDefinition Width="10" />
-                <ColumnDefinition Width="160" />
+                <ColumnDefinition Width="148.8" />
+                <ColumnDefinition Width="11.2" />
+                <ColumnDefinition Width="169.6" />
             </Grid.ColumnDefinitions>
 
-            <Button Content="Save" Grid.Column="0" Height="25" Width="150" Click="Save_Clicked"/>
-            <Button Content="Save Image" Grid.Column="2" Height="25" Width="150" Click="SaveImage_Click" HorizontalAlignment="Left" />
-        </Grid>        
+            <Button Content="Сохранить" Grid.Column="0" Width="145" Click="Save_Clicked" Margin="5,8,0,7.8" HorizontalAlignment="Left" Grid.ColumnSpan="2"/>
+            <Button Content="Сохранить как Изоб." Grid.Column="1" Width="145" Click="SaveImage_Click" HorizontalAlignment="Left" Margin="5.2,8,0,7.8" Grid.ColumnSpan="2" />
+        </Grid>
     </Grid>
 </UserControl>