Skip to content

Commit c3dd50d

Browse files
NSoifferNSoiffer
committed
Added "Use Voice Settings (Auto)" to dialog ("Auto" already in MathCAT)
Changed language-dependent strings to not use "u" as Unicode is the default in newer pythons (one less set of lint warnings)
1 parent 20217a4 commit c3dd50d

File tree

2 files changed

+45
-44
lines changed

2 files changed

+45
-44
lines changed

‎addon/globalPlugins/MathCAT/MathCATPreferences.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,12 @@ def GetLanguages(self):
250250
#clear the language names in the dialog
251251
self.m_choiceLanguage.Clear()
252252
#populate the available language names in the dialog
253+
self.m_choiceLanguage.Append(_("Use Voice's Language") + " (Auto)")
253254
for f in os.listdir(UserInterface.path_to_languages_folder()):
254-
if os.path.isdir(UserInterface.path_to_languages_folder()+"\\"+f):
255-
if languages_dict.get(f, 'missing') == 'missing':
256-
self.m_choiceLanguage.Append(f + " (" + f + ")")
257-
else:
255+
if os.path.isdir(UserInterface.path_to_languages_folder()+"\\"+f):
256+
if languages_dict.get(f, 'missing') == 'missing':
257+
self.m_choiceLanguage.Append(f + " (" + f + ")")
258+
else:
258259
self.m_choiceLanguage.Append(languages_dict[f] + " (" + f + ")")
259260

260261
def GetLanguageCode(self):
@@ -463,7 +464,7 @@ def OnRelativeSpeedChanged( self, event ):
463464
from .MathCAT import ConvertSSMLTextForNVDA
464465
from speech import speak
465466
rate = self.m_sliderRelativeSpeed.GetValue()
466-
text = _(u"<prosody rate='XXX%'>the square root of x squared plus y squared</prosody>").replace("XXX", str(rate), 1)
467+
text = _("<prosody rate='XXX%'>the square root of x squared plus y squared</prosody>").replace("XXX", str(rate), 1)
467468
speak( ConvertSSMLTextForNVDA(text) )
468469

469470
def OnPauseFactorChanged( self, event ):

‎addon/globalPlugins/MathCAT/MathCATgui.py‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class MathCATPreferencesDialog ( wx.Dialog ):
2424

2525
def __init__( self, parent ):
26-
wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"MathCAT Preferences"), pos = wx.DefaultPosition, size = wx.Size( -1,-1 ), style = wx.DEFAULT_DIALOG_STYLE )
26+
wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _("MathCAT Preferences"), pos = wx.DefaultPosition, size = wx.Size( -1,-1 ), style = wx.DEFAULT_DIALOG_STYLE )
2727

2828
self.SetSizeHints( wx.DefaultSize, wx.DefaultSize )
2929

@@ -34,12 +34,12 @@ def __init__( self, parent ):
3434
self.m_panelCategories = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
3535
bSizerCategories = wx.BoxSizer( wx.VERTICAL )
3636

37-
self.m_staticTextCategories = wx.StaticText( self.m_panelCategories, wx.ID_ANY, _(u"Categories:"), wx.DefaultPosition, wx.DefaultSize, 0 )
37+
self.m_staticTextCategories = wx.StaticText( self.m_panelCategories, wx.ID_ANY, _("Categories:"), wx.DefaultPosition, wx.DefaultSize, 0 )
3838
self.m_staticTextCategories.Wrap( -1 )
3939

4040
bSizerCategories.Add( self.m_staticTextCategories, 0, wx.ALL, 5 )
4141

42-
m_listBoxPreferencesTopicChoices = [ _(u"Speech"), _(u"Navigation"), _(u"Braille") ]
42+
m_listBoxPreferencesTopicChoices = [ _("Speech"), _("Navigation"), _("Braille") ]
4343
self.m_listBoxPreferencesTopic = wx.ListBox( self.m_panelCategories, wx.ID_ANY, wx.Point( -1,-1 ), wx.Size( -1,-1 ), m_listBoxPreferencesTopicChoices, wx.LB_NO_SB|wx.LB_SINGLE )
4444
bSizerCategories.Add( self.m_listBoxPreferencesTopic, 0, wx.ALL, 5 )
4545

@@ -61,12 +61,12 @@ def __init__( self, parent ):
6161

6262
bSizerImpairment = wx.BoxSizer( wx.HORIZONTAL )
6363

64-
self.m_staticTextImpairment = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Generate speech for:"), wx.DefaultPosition, wx.DefaultSize, 0 )
64+
self.m_staticTextImpairment = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Generate speech for:"), wx.DefaultPosition, wx.DefaultSize, 0 )
6565
self.m_staticTextImpairment.Wrap( -1 )
6666

6767
bSizerImpairment.Add( self.m_staticTextImpairment, 0, wx.ALL, 5 )
6868

69-
m_choiceImpairmentChoices = [ _(u"Learning disabilities"), _(u"Blindness"), _(u"Low vision") ]
69+
m_choiceImpairmentChoices = [ _("Learning disabilities"), _("Blindness"), _("Low vision") ]
7070
self.m_choiceImpairment = wx.Choice( self.m_panelSpeech, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceImpairmentChoices, 0 )
7171
self.m_choiceImpairment.SetSelection( 1 )
7272
bSizerImpairment.Add( self.m_choiceImpairment, 0, wx.ALL, 5 )
@@ -76,12 +76,12 @@ def __init__( self, parent ):
7676

7777
bSizerLanguage = wx.BoxSizer( wx.HORIZONTAL )
7878

79-
self.m_staticTextLanguage = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Language:"), wx.DefaultPosition, wx.DefaultSize, 0 )
79+
self.m_staticTextLanguage = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Language:"), wx.DefaultPosition, wx.DefaultSize, 0 )
8080
self.m_staticTextLanguage.Wrap( -1 )
8181

8282
bSizerLanguage.Add( self.m_staticTextLanguage, 0, wx.ALL, 5 )
8383

84-
m_choiceLanguageChoices = [ _(u"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") ]
84+
m_choiceLanguageChoices = [ _("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") ]
8585
self.m_choiceLanguage = wx.Choice( self.m_panelSpeech, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceLanguageChoices, 0 )
8686
self.m_choiceLanguage.SetSelection( 0 )
8787
bSizerLanguage.Add( self.m_choiceLanguage, 0, wx.ALL, 5 )
@@ -91,12 +91,12 @@ def __init__( self, parent ):
9191

9292
bSizerSpeechStyle = wx.BoxSizer( wx.HORIZONTAL )
9393

94-
self.m_staticTextSpeechStyle = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Speech style:"), wx.DefaultPosition, wx.DefaultSize, 0 )
94+
self.m_staticTextSpeechStyle = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Speech style:"), wx.DefaultPosition, wx.DefaultSize, 0 )
9595
self.m_staticTextSpeechStyle.Wrap( -1 )
9696

9797
bSizerSpeechStyle.Add( self.m_staticTextSpeechStyle, 0, wx.ALL, 5 )
9898

99-
m_choiceSpeechStyleChoices = [ _(u"xxxxxxxxxxxxxxxx") ]
99+
m_choiceSpeechStyleChoices = [ _("xxxxxxxxxxxxxxxx") ]
100100
self.m_choiceSpeechStyle = wx.Choice( self.m_panelSpeech, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceSpeechStyleChoices, 0 )
101101
self.m_choiceSpeechStyle.SetSelection( 0 )
102102
bSizerSpeechStyle.Add( self.m_choiceSpeechStyle, 0, wx.ALL, 5 )
@@ -106,12 +106,12 @@ def __init__( self, parent ):
106106

107107
bSizer71 = wx.BoxSizer( wx.HORIZONTAL )
108108

109-
self.m_staticTextSpeechAmount = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Speech amount:"), wx.DefaultPosition, wx.DefaultSize, 0 )
109+
self.m_staticTextSpeechAmount = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Speech amount:"), wx.DefaultPosition, wx.DefaultSize, 0 )
110110
self.m_staticTextSpeechAmount.Wrap( -1 )
111111

112112
bSizer71.Add( self.m_staticTextSpeechAmount, 0, wx.ALL, 5 )
113113

114-
m_choiceSpeechAmountChoices = [ _(u"Terse"), _(u"Medium"), _(u"Verbose") ]
114+
m_choiceSpeechAmountChoices = [ _("Terse"), _("Medium"), _("Verbose") ]
115115
self.m_choiceSpeechAmount = wx.Choice( self.m_panelSpeech, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceSpeechAmountChoices, 0 )
116116
self.m_choiceSpeechAmount.SetSelection( 0 )
117117
bSizer71.Add( self.m_choiceSpeechAmount, 0, wx.ALL, 5 )
@@ -121,7 +121,7 @@ def __init__( self, parent ):
121121

122122
bSizerRelativeSpeed = wx.BoxSizer( wx.HORIZONTAL )
123123

124-
self.m_staticTextRelativeSpeed = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Relative speech rate:"), wx.DefaultPosition, wx.DefaultSize, 0 )
124+
self.m_staticTextRelativeSpeed = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Relative speech rate:"), wx.DefaultPosition, wx.DefaultSize, 0 )
125125
self.m_staticTextRelativeSpeed.Wrap( -1 )
126126

127127
bSizerRelativeSpeed.Add( self.m_staticTextRelativeSpeed, 0, wx.ALL, 5 )
@@ -135,7 +135,7 @@ def __init__( self, parent ):
135135

136136
bSizerPauseFactor = wx.BoxSizer( wx.HORIZONTAL )
137137

138-
self.m_staticPauseFactor = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Pause factor:"), wx.DefaultPosition, wx.DefaultSize, 0 )
138+
self.m_staticPauseFactor = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Pause factor:"), wx.DefaultPosition, wx.DefaultSize, 0 )
139139
self.m_staticPauseFactor.Wrap( -1 )
140140

141141
bSizerPauseFactor.Add( self.m_staticPauseFactor, 0, wx.ALL, 5 )
@@ -148,20 +148,20 @@ def __init__( self, parent ):
148148

149149
bSizerSpeechSound = wx.BoxSizer( wx.HORIZONTAL )
150150

151-
self.m_checkBoxSpeechSound = wx.CheckBox( self.m_panelSpeech, wx.ID_ANY, _(u"Make a sound when starting/ending math speech"), wx.DefaultPosition, wx.DefaultSize, 0 )
151+
self.m_checkBoxSpeechSound = wx.CheckBox( self.m_panelSpeech, wx.ID_ANY, _("Make a sound when starting/ending math speech"), wx.DefaultPosition, wx.DefaultSize, 0 )
152152
bSizerSpeechSound.Add( self.m_checkBoxSpeechSound, 0, wx.ALL, 5 )
153153

154154

155155
bSizerSpeech.Add( bSizerSpeechSound, 1, wx.EXPAND, 5 )
156156

157157
bSizerSubjectArea = wx.BoxSizer( wx.HORIZONTAL )
158158

159-
self.m_staticTextSubjectArea = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Subject area to be used when it cannot be determined automatically:"), wx.DefaultPosition, wx.DefaultSize, 0 )
159+
self.m_staticTextSubjectArea = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Subject area to be used when it cannot be determined automatically:"), wx.DefaultPosition, wx.DefaultSize, 0 )
160160
self.m_staticTextSubjectArea.Wrap( -1 )
161161

162162
bSizerSubjectArea.Add( self.m_staticTextSubjectArea, 0, wx.ALL, 5 )
163163

164-
m_choiceSubjectAreaChoices = [ _(u"General") ]
164+
m_choiceSubjectAreaChoices = [ _("General") ]
165165
self.m_choiceSubjectArea = wx.Choice( self.m_panelSpeech, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceSubjectAreaChoices, 0 )
166166
self.m_choiceSubjectArea.SetSelection( 0 )
167167
bSizerSubjectArea.Add( self.m_choiceSubjectArea, 0, wx.ALL, 5 )
@@ -171,12 +171,12 @@ def __init__( self, parent ):
171171

172172
bSizerSpeechForChemical = wx.BoxSizer( wx.HORIZONTAL )
173173

174-
self.m_staticTextSpeechForChemical = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _(u"Speech for chemical formulas:"), wx.DefaultPosition, wx.DefaultSize, 0 )
174+
self.m_staticTextSpeechForChemical = wx.StaticText( self.m_panelSpeech, wx.ID_ANY, _("Speech for chemical formulas:"), wx.DefaultPosition, wx.DefaultSize, 0 )
175175
self.m_staticTextSpeechForChemical.Wrap( -1 )
176176

177177
bSizerSpeechForChemical.Add( self.m_staticTextSpeechForChemical, 0, wx.ALL, 5 )
178178

179-
m_choiceSpeechForChemicalChoices = [ _(u"Spell it out (H 2 O)"), _(u"Off (H sub 2 O)") ]
179+
m_choiceSpeechForChemicalChoices = [ _("Spell it out (H 2 O)"), _("Off (H sub 2 O)") ]
180180
self.m_choiceSpeechForChemical = wx.Choice( self.m_panelSpeech, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceSpeechForChemicalChoices, 0 )
181181
self.m_choiceSpeechForChemical.SetSelection( 0 )
182182
bSizerSpeechForChemical.Add( self.m_choiceSpeechForChemical, 0, wx.ALL, 5 )
@@ -188,31 +188,31 @@ def __init__( self, parent ):
188188
self.m_panelSpeech.SetSizer( bSizerSpeech )
189189
self.m_panelSpeech.Layout()
190190
bSizerSpeech.Fit( self.m_panelSpeech )
191-
self.m_simplebookPanelsCategories.AddPage( self.m_panelSpeech, _(u"a page"), False )
191+
self.m_simplebookPanelsCategories.AddPage( self.m_panelSpeech, _("a page"), False )
192192
self.m_panelNavigation = wx.Panel( self.m_simplebookPanelsCategories, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.BORDER_SIMPLE|wx.TAB_TRAVERSAL )
193193
bSizerNavigation = wx.BoxSizer( wx.VERTICAL )
194194

195-
sbSizerNavigationMode = wx.StaticBoxSizer( wx.StaticBox( self.m_panelNavigation, wx.ID_ANY, _(u"Navigation mode to use when beginning to navigate an equation:") ), wx.VERTICAL )
195+
sbSizerNavigationMode = wx.StaticBoxSizer( wx.StaticBox( self.m_panelNavigation, wx.ID_ANY, _("Navigation mode to use when beginning to navigate an equation:") ), wx.VERTICAL )
196196

197-
m_choiceNavigationModeChoices = [ _(u"Enhanced"), _(u"Simple"), _(u"Character") ]
197+
m_choiceNavigationModeChoices = [ _("Enhanced"), _("Simple"), _("Character") ]
198198
self.m_choiceNavigationMode = wx.Choice( sbSizerNavigationMode.GetStaticBox(), wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceNavigationModeChoices, 0 )
199199
self.m_choiceNavigationMode.SetSelection( 1 )
200200
sbSizerNavigationMode.Add( self.m_choiceNavigationMode, 0, wx.ALL, 5 )
201201

202-
self.m_checkBoxResetNavigationMode = wx.CheckBox( sbSizerNavigationMode.GetStaticBox(), wx.ID_ANY, _(u"Reset navigation mode on entry to an expression"), wx.DefaultPosition, wx.DefaultSize, 0 )
202+
self.m_checkBoxResetNavigationMode = wx.CheckBox( sbSizerNavigationMode.GetStaticBox(), wx.ID_ANY, _("Reset navigation mode on entry to an expression"), wx.DefaultPosition, wx.DefaultSize, 0 )
203203
sbSizerNavigationMode.Add( self.m_checkBoxResetNavigationMode, 0, wx.ALL, 5 )
204204

205205

206206
bSizerNavigation.Add( sbSizerNavigationMode, 1, wx.EXPAND, 5 )
207207

208-
sbSizerNavigationSpeech = wx.StaticBoxSizer( wx.StaticBox( self.m_panelNavigation, wx.ID_ANY, _(u"Navigation speech to use when beginning to navigate an equation:") ), wx.VERTICAL )
208+
sbSizerNavigationSpeech = wx.StaticBoxSizer( wx.StaticBox( self.m_panelNavigation, wx.ID_ANY, _("Navigation speech to use when beginning to navigate an equation:") ), wx.VERTICAL )
209209

210-
m_choiceNavigationSpeechChoices = [ _(u"Speak"), _(u"Describe/overview") ]
210+
m_choiceNavigationSpeechChoices = [ _("Speak"), _("Describe/overview") ]
211211
self.m_choiceNavigationSpeech = wx.Choice( sbSizerNavigationSpeech.GetStaticBox(), wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceNavigationSpeechChoices, 0 )
212212
self.m_choiceNavigationSpeech.SetSelection( 1 )
213213
sbSizerNavigationSpeech.Add( self.m_choiceNavigationSpeech, 0, wx.ALL, 5 )
214214

215-
self.m_checkBoxResetNavigationSpeech = wx.CheckBox( sbSizerNavigationSpeech.GetStaticBox(), wx.ID_ANY, _(u"Reset navigation speech on entry to an expression"), wx.DefaultPosition, wx.DefaultSize, 0 )
215+
self.m_checkBoxResetNavigationSpeech = wx.CheckBox( sbSizerNavigationSpeech.GetStaticBox(), wx.ID_ANY, _("Reset navigation speech on entry to an expression"), wx.DefaultPosition, wx.DefaultSize, 0 )
216216
self.m_checkBoxResetNavigationSpeech.SetValue(True)
217217
sbSizerNavigationSpeech.Add( self.m_checkBoxResetNavigationSpeech, 0, wx.ALL, 5 )
218218

@@ -221,17 +221,17 @@ def __init__( self, parent ):
221221

222222
bSizerNavigationZoom = wx.BoxSizer( wx.VERTICAL )
223223

224-
self.m_checkBoxAutomaticZoom = wx.CheckBox( self.m_panelNavigation, wx.ID_ANY, _(u"Automatic zoom out of 2D notations"), wx.DefaultPosition, wx.DefaultSize, 0 )
224+
self.m_checkBoxAutomaticZoom = wx.CheckBox( self.m_panelNavigation, wx.ID_ANY, _("Automatic zoom out of 2D notations"), wx.DefaultPosition, wx.DefaultSize, 0 )
225225
bSizerNavigationZoom.Add( self.m_checkBoxAutomaticZoom, 0, wx.ALL, 5 )
226226

227227
bSizerSpeechAmountNavigation = wx.BoxSizer( wx.HORIZONTAL )
228228

229-
self.m_staticTextSpeechAmountNavigation = wx.StaticText( self.m_panelNavigation, wx.ID_ANY, _(u"Speech amount for navigation:"), wx.DefaultPosition, wx.DefaultSize, 0 )
229+
self.m_staticTextSpeechAmountNavigation = wx.StaticText( self.m_panelNavigation, wx.ID_ANY, _("Speech amount for navigation:"), wx.DefaultPosition, wx.DefaultSize, 0 )
230230
self.m_staticTextSpeechAmountNavigation.Wrap( -1 )
231231

232232
bSizerSpeechAmountNavigation.Add( self.m_staticTextSpeechAmountNavigation, 0, wx.ALL, 5 )
233233

234-
m_choiceSpeechAmountNavigationChoices = [ _(u"Terse"), _(u"Medium"), _(u"Verbose") ]
234+
m_choiceSpeechAmountNavigationChoices = [ _("Terse"), _("Medium"), _("Verbose") ]
235235
self.m_choiceSpeechAmountNavigation = wx.Choice( self.m_panelNavigation, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceSpeechAmountNavigationChoices, 0 )
236236
self.m_choiceSpeechAmountNavigation.SetSelection( 0 )
237237
bSizerSpeechAmountNavigation.Add( self.m_choiceSpeechAmountNavigation, 0, wx.ALL, 5 )
@@ -246,18 +246,18 @@ def __init__( self, parent ):
246246
self.m_panelNavigation.SetSizer( bSizerNavigation )
247247
self.m_panelNavigation.Layout()
248248
bSizerNavigation.Fit( self.m_panelNavigation )
249-
self.m_simplebookPanelsCategories.AddPage( self.m_panelNavigation, _(u"a page"), False )
249+
self.m_simplebookPanelsCategories.AddPage( self.m_panelNavigation, _("a page"), False )
250250
self.m_panelBraille = wx.Panel( self.m_simplebookPanelsCategories, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.BORDER_SIMPLE|wx.TAB_TRAVERSAL )
251251
bSizerBraille = wx.BoxSizer( wx.VERTICAL )
252252

253253
bSizerBrailleMathCode = wx.BoxSizer( wx.HORIZONTAL )
254254

255-
self.m_staticTextBrailleMathCode = wx.StaticText( self.m_panelBraille, wx.ID_ANY, _(u"Braille math code for refreshable displays:"), wx.DefaultPosition, wx.DefaultSize, 0 )
255+
self.m_staticTextBrailleMathCode = wx.StaticText( self.m_panelBraille, wx.ID_ANY, _("Braille math code for refreshable displays:"), wx.DefaultPosition, wx.DefaultSize, 0 )
256256
self.m_staticTextBrailleMathCode.Wrap( -1 )
257257

258258
bSizerBrailleMathCode.Add( self.m_staticTextBrailleMathCode, 0, wx.ALL, 5 )
259259

260-
m_choiceBrailleMathCodeChoices = [ _(u"Nemeth"), _(u"UEB"), _(u"Vietnam") ]
260+
m_choiceBrailleMathCodeChoices = [ _("Nemeth"), _("UEB"), _("Vietnam") ]
261261
self.m_choiceBrailleMathCode = wx.Choice( self.m_panelBraille, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceBrailleMathCodeChoices, 0 )
262262
self.m_choiceBrailleMathCode.SetSelection( 1 )
263263
bSizerBrailleMathCode.Add( self.m_choiceBrailleMathCode, 0, wx.ALL, 5 )
@@ -267,12 +267,12 @@ def __init__( self, parent ):
267267

268268
bSizerBrailleHighlights = wx.BoxSizer( wx.HORIZONTAL )
269269

270-
self.m_staticTextBrailleHighlights = wx.StaticText( self.m_panelBraille, wx.ID_ANY, _(u"Highlight with dots 7 && 8 the current nav node:"), wx.DefaultPosition, wx.DefaultSize, 0 )
270+
self.m_staticTextBrailleHighlights = wx.StaticText( self.m_panelBraille, wx.ID_ANY, _("Highlight with dots 7 && 8 the current nav node:"), wx.DefaultPosition, wx.DefaultSize, 0 )
271271
self.m_staticTextBrailleHighlights.Wrap( -1 )
272272

273273
bSizerBrailleHighlights.Add( self.m_staticTextBrailleHighlights, 0, wx.ALL, 5 )
274274

275-
m_choiceBrailleHighlightsChoices = [ _(u"Off"), _(u"First character"), _(u"Endpoints"), _(u"All") ]
275+
m_choiceBrailleHighlightsChoices = [ _("Off"), _("First character"), _("Endpoints"), _("All") ]
276276
self.m_choiceBrailleHighlights = wx.Choice( self.m_panelBraille, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_choiceBrailleHighlightsChoices, 0 )
277277
self.m_choiceBrailleHighlights.SetSelection( 1 )
278278
bSizerBrailleHighlights.Add( self.m_choiceBrailleHighlights, 0, wx.ALL, 5 )
@@ -299,7 +299,7 @@ def __init__( self, parent ):
299299
self.m_panelBraille.SetSizer( bSizerBraille )
300300
self.m_panelBraille.Layout()
301301
bSizerBraille.Fit( self.m_panelBraille )
302-
self.m_simplebookPanelsCategories.AddPage( self.m_panelBraille, _(u"a page"), False )
302+
self.m_simplebookPanelsCategories.AddPage( self.m_panelBraille, _("a page"), False )
303303

304304
gbSizerMathCATPreferences.Add( self.m_simplebookPanelsCategories, wx.GBPosition( 0, 1 ), wx.GBSpan( 1, 1 ), wx.EXPAND |wx.ALL, 10 )
305305

@@ -312,19 +312,19 @@ def __init__( self, parent ):
312312

313313
bSizerButtons.Add( ( 0, 0), 1, wx.EXPAND, 5 )
314314

315-
self.m_buttonOK = wx.Button( self.m_panelButtons, wx.ID_ANY, _(u"OK"), wx.DefaultPosition, wx.DefaultSize, 0 )
315+
self.m_buttonOK = wx.Button( self.m_panelButtons, wx.ID_ANY, _("OK"), wx.DefaultPosition, wx.DefaultSize, 0 )
316316
bSizerButtons.Add( self.m_buttonOK, 0, wx.ALL, 5 )
317317

318-
self.m_buttonCancel = wx.Button( self.m_panelButtons, wx.ID_ANY, _(u"Cancel"), wx.DefaultPosition, wx.DefaultSize, 0 )
318+
self.m_buttonCancel = wx.Button( self.m_panelButtons, wx.ID_ANY, _("Cancel"), wx.DefaultPosition, wx.DefaultSize, 0 )
319319
bSizerButtons.Add( self.m_buttonCancel, 0, wx.ALL, 5 )
320320

321-
self.m_buttonApply = wx.Button( self.m_panelButtons, wx.ID_ANY, _(u"Apply"), wx.DefaultPosition, wx.DefaultSize, 0 )
321+
self.m_buttonApply = wx.Button( self.m_panelButtons, wx.ID_ANY, _("Apply"), wx.DefaultPosition, wx.DefaultSize, 0 )
322322
bSizerButtons.Add( self.m_buttonApply, 0, wx.ALL, 5 )
323323

324-
self.m_buttonReset = wx.Button( self.m_panelButtons, wx.ID_ANY, _(u"Reset to defaults"), wx.DefaultPosition, wx.DefaultSize, 0 )
324+
self.m_buttonReset = wx.Button( self.m_panelButtons, wx.ID_ANY, _("Reset to defaults"), wx.DefaultPosition, wx.DefaultSize, 0 )
325325
bSizerButtons.Add( self.m_buttonReset, 0, wx.ALL, 5 )
326326

327-
self.m_buttonHelp = wx.Button( self.m_panelButtons, wx.ID_ANY, _(u"Help"), wx.DefaultPosition, wx.DefaultSize, 0 )
327+
self.m_buttonHelp = wx.Button( self.m_panelButtons, wx.ID_ANY, _("Help"), wx.DefaultPosition, wx.DefaultSize, 0 )
328328
bSizerButtons.Add( self.m_buttonHelp, 0, wx.ALL, 5 )
329329

330330

0 commit comments

Comments
 (0)