Skip to content

Commit d6c5523

Browse files
na1307na1307
committed
Localize Part 3
1 parent 1aa25bb commit d6c5523

File tree

5 files changed

+223
-16
lines changed

5 files changed

+223
-16
lines changed

‎EncodingConverter.VisualStudio.V2/ChooseEncodingControl.xaml.cs

+7-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace EncodingConverter.VisualStudio;
66
/// ChooseEncodingControl.xaml에 대한 상호 작용 논리
77
/// </summary>
88
public partial class ChooseEncodingControl {
9-
private static readonly string[] encodings = ["System Encoding", "UTF-8 with BOM", "UTF-8 without BOM"];
9+
private static readonly string[] encodings = [Properties.Resources.SystemEncoding, Properties.Resources.Utf8WithBom, Properties.Resources.Utf8WithoutBom];
1010
private static readonly UTF8Encoding utf8withBom = new(encoderShouldEmitUTF8Identifier: true);
1111
private static readonly UTF8Encoding utf8withoutBom = new(encoderShouldEmitUTF8Identifier: false);
1212

@@ -16,14 +16,10 @@ public ChooseEncodingControl() {
1616
encodingsCombo.SelectedIndex = encodingsCombo.Items.Count - 1;
1717
}
1818

19-
public Encoding ChosenEncoding {
20-
get {
21-
return encodingsCombo.SelectedIndex switch {
22-
0 => Encoding.Default, // System Encoding
23-
1 => utf8withBom, // UTF-8 with BOM
24-
2 => utf8withoutBom, // UTF-8 without BOM
25-
_ => throw new InvalidOperationException(),
26-
};
27-
}
28-
}
19+
public Encoding ChosenEncoding => encodingsCombo.SelectedIndex switch {
20+
0 => Encoding.Default, // System Encoding
21+
1 => utf8withBom, // UTF-8 with BOM
22+
2 => utf8withoutBom, // UTF-8 without BOM
23+
_ => throw new InvalidOperationException(),
24+
};
2925
}

‎EncodingConverter.VisualStudio.V2/ConvertCommand.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.VisualStudio.Extensibility;
1+
using EncodingConverter.VisualStudio.Properties;
2+
using Microsoft.VisualStudio.Extensibility;
23
using Microsoft.VisualStudio.Extensibility.Commands;
34
using Microsoft.VisualStudio.Extensibility.VSSdkCompatibility;
45
using Microsoft.VisualStudio.RpcContracts.Notifications;
@@ -16,7 +17,7 @@ public sealed override async Task ExecuteCommandAsync(IClientContext context, Ca
1617

1718
ChooseEncodingControl control = new();
1819

19-
if (await Extensibility.Shell().ShowDialogAsync((WpfControlWrapper)control, "Choose Encoding", DialogOption.OKCancel, cancellationToken) == DialogResult.OK) {
20+
if (await Extensibility.Shell().ShowDialogAsync((WpfControlWrapper)control, Resources.ChooseEncoding, DialogOption.OKCancel, cancellationToken) == DialogResult.OK) {
2021
var items = await GetItemsAsync(cancellationToken);
2122
var array = items.ToArray();
2223
var statusbar = await statusbarProvider.GetServiceAsync();
@@ -38,13 +39,13 @@ public sealed override async Task ExecuteCommandAsync(IClientContext context, Ca
3839
await ConverterCore.ConvertEncodingAsync(file, control.ChosenEncoding);
3940

4041
// Progress bar
41-
statusbar.Progress(ref cookie, 1, $"{i + 1}/{array.Length} file processed", (uint)(i + 1), (uint)array.Length);
42+
statusbar.Progress(ref cookie, 1, string.Format(Resources.StatusbarText, i + 1, array.Length), (uint)(i + 1), (uint)array.Length);
4243

4344
#pragma warning disable VSEXTPREVIEW_OUTPUTWINDOW // 형식은 평가 목적으로 제공되며, 이후 업데이트에서 변경되거나 제거될 수 있습니다. 계속하려면 이 진단을 표시하지 않습니다.
4445
// Print to Output window
45-
var channel = await context.Extensibility.Views().Output.GetChannelAsync("Encoding Converter", nameof(Properties.Resources.OWString), cancellationToken);
46+
var channel = await context.Extensibility.Views().Output.GetChannelAsync("Encoding Converter", nameof(Resources.OWString), cancellationToken);
4647

47-
await channel.Writer.WriteLineAsync($"Encoding Converter: {file.Name} processed ({i + 1}/{array.Length})");
48+
await channel.Writer.WriteLineAsync(string.Format(Resources.OutputText, file.Name, i + 1, array.Length));
4849
#pragma warning restore VSEXTPREVIEW_OUTPUTWINDOW // 형식은 평가 목적으로 제공되며, 이후 업데이트에서 변경되거나 제거될 수 있습니다. 계속하려면 이 진단을 표시하지 않습니다.
4950
}
5051

‎EncodingConverter.VisualStudio.V2/Properties/Resources.Designer.cs

+54
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EncodingConverter.VisualStudio.V2/Properties/Resources.ko.resx

+138
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
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="ChooseEncoding" xml:space="preserve">
121+
<value>인코딩 선택</value>
122+
</data>
123+
<data name="OutputText" xml:space="preserve">
124+
<value>Encoding Converter: {0} 처리됨 ({1}/{2})</value>
125+
</data>
126+
<data name="StatusbarText" xml:space="preserve">
127+
<value>{0}/{1} 파일 처리됨</value>
128+
</data>
129+
<data name="SystemEncoding" xml:space="preserve">
130+
<value>시스템 인코딩</value>
131+
</data>
132+
<data name="Utf8WithBom" xml:space="preserve">
133+
<value>UTF-8 (BOM)</value>
134+
</data>
135+
<data name="Utf8WithoutBom" xml:space="preserve">
136+
<value>UTF-8</value>
137+
</data>
138+
</root>

‎EncodingConverter.VisualStudio.V2/Properties/Resources.resx

+18
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,25 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<data name="ChooseEncoding" xml:space="preserve">
121+
<value>Choose Encoding</value>
122+
</data>
123+
<data name="OutputText" xml:space="preserve">
124+
<value>Encoding Converter: {0} processed ({1}/{2})</value>
125+
</data>
120126
<data name="OWString" xml:space="preserve">
121127
<value>Encoding Converter</value>
122128
</data>
129+
<data name="StatusbarText" xml:space="preserve">
130+
<value>{0}/{1} file processed</value>
131+
</data>
132+
<data name="SystemEncoding" xml:space="preserve">
133+
<value>System Encoding</value>
134+
</data>
135+
<data name="Utf8WithBom" xml:space="preserve">
136+
<value>UTF-8 with BOM</value>
137+
</data>
138+
<data name="Utf8WithoutBom" xml:space="preserve">
139+
<value>UTF-8 without BOM</value>
140+
</data>
123141
</root>

0 commit comments

Comments
 (0)