Changeset 950
- Timestamp:
- 5/1/2009 4:22:43 AM (4 years ago)
- Location:
- branches/eraser6/DefaultPlugins
- Files:
-
- 6 edited
-
CustomMethodEditorForm.cs (modified) (5 diffs)
-
CustomMethodPassEditor.cs (modified) (4 diffs)
-
SettingsForm.cs (modified) (3 diffs)
-
Strings.en.resx (modified) (2 diffs)
-
Strings.nl.resx (modified) (2 diffs)
-
Strings.resx (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eraser6/DefaultPlugins/CustomMethodEditorForm.cs
r908 r950 27 27 using System.Text; 28 28 using System.Windows.Forms; 29 using System.Globalization; 29 30 using Eraser.Manager; 30 31 using Eraser.Util; … … 90 91 private ListViewItem AddPass(ErasureMethod.Pass pass) 91 92 { 92 ListViewItem item = new ListViewItem((passesLv.Items.Count + 1).ToString()); 93 ListViewItem item = new ListViewItem((passesLv.Items.Count + 1).ToString( 94 CultureInfo.CurrentCulture)); 93 95 item.Tag = pass; 94 96 if (pass.Function == ErasureMethod.Pass.WriteRandom) 95 item.SubItems.Add( "Random Data");97 item.SubItems.Add(S._("Random Data")); 96 98 else 97 item.SubItems.Add( string.Format("Constant ({0} bytes)", ((byte[])pass.OpaqueValue).Length));99 item.SubItems.Add(S._("Constant ({0} bytes)", ((byte[])pass.OpaqueValue).Length)); 98 100 99 101 passesLv.Items.Add(item); … … 111 113 pass.Function = ErasureMethod.Pass.WriteRandom; 112 114 pass.OpaqueValue = null; 113 item.SubItems[1].Text = "Random Data";115 item.SubItems[1].Text = S._("Random Data"); 114 116 } 115 117 else … … 117 119 pass.Function = ErasureMethod.Pass.WriteConstant; 118 120 pass.OpaqueValue = passEditor.PassData; 119 item.SubItems[1].Text = string.Format("Constant ({0} bytes)", passEditor.PassData.Length);121 item.SubItems[1].Text = S._("Constant ({0} bytes)", passEditor.PassData.Length); 120 122 } 121 123 } … … 141 143 { 142 144 foreach (ListViewItem item in passesLv.Items) 143 item.Text = (item.Index + 1).ToString( );145 item.Text = (item.Index + 1).ToString(CultureInfo.CurrentCulture); 144 146 } 145 147 -
branches/eraser6/DefaultPlugins/CustomMethodPassEditor.cs
r908 r950 7 7 using System.Text; 8 8 using System.Windows.Forms; 9 using System.Globalization; 9 10 using Eraser.Util; 10 11 … … 89 90 if (parseHex) 90 91 { 91 string str = text.Replace(" ", "").ToUpper( );92 string str = text.Replace(" ", "").ToUpper(CultureInfo.CurrentCulture); 92 93 List<byte> passConstantList = new List<byte>(); 93 94 … … 127 128 StringBuilder displayText = new StringBuilder(); 128 129 foreach (byte b in array) 129 displayText.Append(string.Format("{0,2} ", Convert.ToString(b, 16))); 130 displayText.Append(string.Format(CultureInfo.CurrentCulture, 131 "{0,2} ", Convert.ToString(b, 16))); 130 132 return displayText.ToString(); 131 133 } … … 174 176 MessageBox.Show(this, S._("The pass constant cannot be displayed as " + 175 177 "text because it contains invalid characters."), S._("Eraser"), 176 MessageBoxButtons.OK, MessageBoxIcon.Information); 178 MessageBoxButtons.OK, MessageBoxIcon.Information, 179 MessageBoxDefaultButton.Button1, 180 S.IsRightToLeft(this) ? MessageBoxOptions.RtlReading : 0); 177 181 passTypeHex.Checked = true; 178 182 } -
branches/eraser6/DefaultPlugins/SettingsForm.cs
r938 r950 27 27 using System.Text; 28 28 using System.Windows.Forms; 29 using System.Globalization; 30 29 31 using Eraser.Manager; 32 using Eraser.Util; 30 33 31 34 namespace Eraser.DefaultPlugins … … 133 136 if (fl16MethodCmb.SelectedIndex == -1) 134 137 { 135 errorProvider.SetError(fl16MethodCmb, "An invalid erasure method was selected.");138 errorProvider.SetError(fl16MethodCmb, S._("An invalid erasure method was selected.")); 136 139 return; 137 140 } … … 162 165 { 163 166 ListViewItem item = customMethod.Items.Add(method.Name); 164 item.SubItems.Add(method.Passes.Length.ToString( ));167 item.SubItems.Add(method.Passes.Length.ToString(CultureInfo.CurrentCulture)); 165 168 item.Tag = method; 166 169 } -
branches/eraser6/DefaultPlugins/Strings.en.resx
r661 r950 118 118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 119 119 </resheader> 120 <data name="Random Data" xml:space="preserve"> 121 <value>Random Data</value> 122 </data> 123 <data name="Constant ({0} bytes)" xml:space="preserve"> 124 <value>Constant ({0} bytes)</value> 125 </data> 120 126 <data name="The name of the custom method cannot be empty." xml:space="preserve"> 121 127 <value>The name of the custom method cannot be empty.</value> … … 193 199 <value>ISAAC CSPRNG</value> 194 200 </data> 201 <data name="An invalid erasure method was selected." xml:space="preserve"> 202 <value>An invalid erasure method was selected.</value> 203 </data> 195 204 </root> -
branches/eraser6/DefaultPlugins/Strings.nl.resx
r655 r950 118 118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 119 119 </resheader> 120 <data name="Random Data" xml:space="preserve"> 121 <value>(Untranslated)</value> 122 </data> 123 <data name="Constant ({0} bytes)" xml:space="preserve"> 124 <value>(Untranslated)</value> 125 </data> 120 126 <data name="The name of the custom method cannot be empty." xml:space="preserve"> 121 127 <value>(Untranslated)</value> … … 193 199 <value>(Untranslated)</value> 194 200 </data> 201 <data name="An invalid erasure method was selected." xml:space="preserve"> 202 <value>(Untranslated)</value> 203 </data> 195 204 </root> -
branches/eraser6/DefaultPlugins/Strings.resx
r655 r950 118 118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 119 119 </resheader> 120 <data name="Random Data" xml:space="preserve"> 121 <value>Random Data</value> 122 </data> 123 <data name="Constant ({0} bytes)" xml:space="preserve"> 124 <value>Constant ({0} bytes)</value> 125 </data> 120 126 <data name="The name of the custom method cannot be empty." xml:space="preserve"> 121 127 <value>The name of the custom method cannot be empty.</value> … … 193 199 <value>ISAAC CSPRNG</value> 194 200 </data> 201 <data name="An invalid erasure method was selected." xml:space="preserve"> 202 <value>An invalid erasure method was selected.</value> 203 </data> 195 204 </root>
Note: See TracChangeset
for help on using the changeset viewer.
