Skip to content

Commit 65b1823

Browse files
anovikanovik
authored
Merge pull request #88 from Diaskhan/dev/multilang
Dev/multilang
2 parents 3c636fe + f7cea9b commit 65b1823

8 files changed

Lines changed: 388 additions & 2 deletions

File tree

‎src/SmartCommander/Assets/Resources.Designer.cs‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/SmartCommander/Assets/Resources.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,4 +303,7 @@
303303
<data name="TooLargeSize" xml:space="preserve">
304304
<value>Too large file size for viewing.</value>
305305
</data>
306+
<data name="Reboot" xml:space="preserve">
307+
<value>*Application restart required</value>
308+
</data>
306309
</root>

‎src/SmartCommander/Assets/Resources.ru-RU.resx‎

Lines changed: 309 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,309 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="Alert" xml:space="preserve">
121+
<value>Оповещение</value>
122+
</data>
123+
<data name="ArchiveExists" xml:space="preserve">
124+
<value>Архив {0} уже существует.</value>
125+
</data>
126+
<data name="Cancel" xml:space="preserve">
127+
<value>Отмена</value>
128+
</data>
129+
<data name="CantCopyFileToItself" xml:space="preserve">
130+
<value>Невозможно скопировать файлы в ту же директорию</value>
131+
</data>
132+
<data name="CantEditFolder" xml:space="preserve">
133+
<value>Невозможно редактировать папку</value>
134+
</data>
135+
<data name="CantMoveFileToItself" xml:space="preserve">
136+
<value>Невозможно переместить файлы в ту же директорию</value>
137+
</data>
138+
<data name="CantMoveFolderHere" xml:space="preserve">
139+
<value>Невозможно переместить папку сюда</value>
140+
</data>
141+
<data name="CantMoveFolderToItself" xml:space="preserve">
142+
<value>Невозможно переместить папку в саму себя</value>
143+
</data>
144+
<data name="CantViewFolder" xml:space="preserve">
145+
<value>Невозможно просмотреть папку</value>
146+
</data>
147+
<data name="CopyTo" xml:space="preserve">
148+
<value>Скопировать {0} в:</value>
149+
</data>
150+
<data name="CreateNewFolder" xml:space="preserve">
151+
<value>Создать новую папку</value>
152+
</data>
153+
<data name="CurrentDirectoryName" xml:space="preserve">
154+
<value>Текущее имя директории</value>
155+
</data>
156+
<data name="CurrentDirInfo" xml:space="preserve">
157+
<value>Файлов: {0}, папок: {1}.</value>
158+
</data>
159+
<data name="DarkTheme" xml:space="preserve">
160+
<value>Тёмная тема</value>
161+
</data>
162+
<data name="Date" xml:space="preserve">
163+
<value>Дата</value>
164+
</data>
165+
<data name="DeleteConfirmation" xml:space="preserve">
166+
<value>Вы уверены, что хотите удалить {0}?</value>
167+
</data>
168+
<data name="DeleteConfirmationNonEmpty" xml:space="preserve">
169+
<value>Папка не пуста. Вы уверены, что хотите удалить {0}?</value>
170+
</data>
171+
<data name="DisplayCommandLine" xml:space="preserve">
172+
<value>Отобразить командную строку</value>
173+
</data>
174+
<data name="DisplayCurrentDirectory" xml:space="preserve">
175+
<value>Отобразить текущую директорию</value>
176+
</data>
177+
<data name="DisplayFunctionKeys" xml:space="preserve">
178+
<value>Отобразить функциональные клавиши</value>
179+
</data>
180+
<data name="DriveNotAvailable" xml:space="preserve">
181+
<value>Диск недоступен</value>
182+
</data>
183+
<data name="Edit" xml:space="preserve">
184+
<value>Редактировать</value>
185+
</data>
186+
<data name="ErrorNoPane" xml:space="preserve">
187+
<value>Ошибка: панель не выбрана</value>
188+
</data>
189+
<data name="Extension" xml:space="preserve">
190+
<value>Расширение</value>
191+
</data>
192+
<data name="F3View" xml:space="preserve">
193+
<value>F3 Просмотр</value>
194+
</data>
195+
<data name="F4Edit" xml:space="preserve">
196+
<value>F4 Редактирование</value>
197+
</data>
198+
<data name="F5Copy" xml:space="preserve">
199+
<value>F5 Копировать</value>
200+
</data>
201+
<data name="F6Move" xml:space="preserve">
202+
<value>F6 Переместить</value>
203+
</data>
204+
<data name="F7CreateNewFolder" xml:space="preserve">
205+
<value>F7 Создать папку</value>
206+
</data>
207+
<data name="F8Delete" xml:space="preserve">
208+
<value>F8 Удалить</value>
209+
</data>
210+
<data name="FileExistsRewrite" xml:space="preserve">
211+
<value>Файл уже существует. Вы уверены, что хотите перезаписать {0}?</value>
212+
</data>
213+
<data name="Folder" xml:space="preserve">
214+
<value>Папка</value>
215+
</data>
216+
<data name="FolderExists" xml:space="preserve">
217+
<value>Папка уже существует</value>
218+
</data>
219+
<data name="ItemsNumber" xml:space="preserve">
220+
<value>{0} элементов</value>
221+
</data>
222+
<data name="LightTheme" xml:space="preserve">
223+
<value>Светлая тема</value>
224+
</data>
225+
<data name="MenuConfiguration" xml:space="preserve">
226+
<value>_Конфигурация</value>
227+
</data>
228+
<data name="MenuExit" xml:space="preserve">
229+
<value>_Выход</value>
230+
</data>
231+
<data name="MenuFile" xml:space="preserve">
232+
<value>_Файл</value>
233+
</data>
234+
<data name="MenuOptions" xml:space="preserve">
235+
<value>_Опции</value>
236+
</data>
237+
<data name="MenuSortByDate" xml:space="preserve">
238+
<value>Сортировать по _дате</value>
239+
</data>
240+
<data name="MenuSortByExtension" xml:space="preserve">
241+
<value>Сортировать по _расширению</value>
242+
</data>
243+
<data name="MenuSortByName" xml:space="preserve">
244+
<value>Сортировать по _имени</value>
245+
</data>
246+
<data name="MenuSortBySize" xml:space="preserve">
247+
<value>Сортировать по _размеру</value>
248+
</data>
249+
<data name="MenuView" xml:space="preserve">
250+
<value>_Вид</value>
251+
</data>
252+
<data name="MoveTo" xml:space="preserve">
253+
<value>Переместить {0} в:</value>
254+
</data>
255+
<data name="Name" xml:space="preserve">
256+
<value>Имя</value>
257+
</data>
258+
<data name="NotFound" xml:space="preserve">
259+
<value>Не найдено: </value>
260+
</data>
261+
<data name="OK" xml:space="preserve">
262+
<value>ОК</value>
263+
</data>
264+
<data name="OperationInProgress" xml:space="preserve">
265+
<value>Операция в процессе:</value>
266+
</data>
267+
<data name="Options" xml:space="preserve">
268+
<value>Опции</value>
269+
</data>
270+
<data name="Save" xml:space="preserve">
271+
<value>Сохранить</value>
272+
</data>
273+
<data name="SaveSettingsOnExit" xml:space="preserve">
274+
<value>Сохранить настройки при выходе</value>
275+
</data>
276+
<data name="SaveWindowPositionSize" xml:space="preserve">
277+
<value>Сохранить положение и размер окна</value>
278+
</data>
279+
<data name="ShowHiddenFiles" xml:space="preserve">
280+
<value>Показать скрытые/системные файлы</value>
281+
</data>
282+
<data name="ShowNonEmptyConfirmation" xml:space="preserve">
283+
<value>Показать подтверждение при удалении непустой папки</value>
284+
</data>
285+
<data name="Size" xml:space="preserve">
286+
<value>Размер</value>
287+
</data>
288+
<data name="StopBackground" xml:space="preserve">
289+
<value>Хотите остановить фоновую операцию?</value>
290+
</data>
291+
<data name="View" xml:space="preserve">
292+
<value>Просмотр</value>
293+
</data>
294+
<data name="Zip" xml:space="preserve">
295+
<value>Архивировать</value>
296+
</data>
297+
<data name="Unzip" xml:space="preserve">
298+
<value>Разархивировать</value>
299+
</data>
300+
<data name="DirectoryExists" xml:space="preserve">
301+
<value>Директория {0} уже существует.</value>
302+
</data>
303+
<data name="TooLargeSize" xml:space="preserve">
304+
<value>Слишком большой размер файла для просмотра.</value>
305+
</data>
306+
<data name="Reboot" xml:space="preserve">
307+
<value>*Требуется перезапуск приложения</value>
308+
</data>
309+
</root>

‎src/SmartCommander/Models/OptionsModel.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static OptionsModel()
2121
}
2222
}
2323
}
24-
public void Save() => File.WriteAllText(_settingsPath, JsonConvert.SerializeObject(this));
24+
public void Save() => File.WriteAllText(_settingsPath, JsonConvert.SerializeObject(this, Formatting.Indented));
2525

2626

2727
public bool IsCurrentDirectoryDisplayed { get; set; } = true;
@@ -53,6 +53,7 @@ static OptionsModel()
5353
public string RightPanePath { get; set; } = "";
5454

5555
public bool IsDarkThemeEnabled { get; set; }
56+
public string Language { get; set; } = "en-US";
5657

5758
}
5859
}

‎src/SmartCommander/SmartCommander.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<ItemGroup>
1616
<AvaloniaResource Include="Assets\**" />
1717
<AvaloniaResource Remove="Assets\Resources.resx" />
18+
<AvaloniaResource Remove="Assets\Resources.ru-RU.resx" />
1819
<None Remove=".gitignore" />
1920
</ItemGroup>
2021
<ItemGroup>

‎src/SmartCommander/ViewModels/MainWindowViewModel.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using SmartCommander.Models;
77
using System;
88
using System.Collections.Generic;
9+
using System.Globalization;
910
using System.IO;
1011
using System.IO.Compression;
1112
using System.Reactive;
@@ -52,9 +53,19 @@ public MainWindowViewModel()
5253
{
5354
RightFileViewModel.CurrentDirectory = OptionsModel.Instance.RightPanePath;
5455
}
56+
SetLanguage();
5557
SetTheme();
5658
_progress = new Progress<int>(v => Progress_Show(v));
5759
}
60+
61+
private void SetLanguage()
62+
{
63+
var cultureName = OptionsModel.Instance.Language;
64+
var culture = new CultureInfo(cultureName);
65+
Thread.CurrentThread.CurrentCulture = culture;
66+
Thread.CurrentThread.CurrentUICulture = culture;
67+
}
68+
5869
private void OnFocusChanged(object? sender, EventArgs e)
5970
{
6071
if (sender is FilesPaneViewModel)

0 commit comments

Comments
 (0)