Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Concise messages: edit user interface messages to fix spelling and grammar issues, general conciseness #77

Merged
merged 10 commits into from
Jul 25, 2020
Merged

Concise messages: edit user interface messages to fix spelling and grammar issues, general conciseness #77

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e765bd3
Global plugin init: edit Braille Extender submenu entries.
josephsl Jul 17, 2020
ded9cd8
Rotor items: headings at level n -> level n headings for conciseness.
josephsl Jul 17, 2020
e163b85
Rotor items: not link text -> non-link text
josephsl Jul 17, 2020
6514904
Braille table dictionary: use index-based string format instead of %s…
josephsl Jul 17, 2020
3d63273
Braille Extender commands: input help messages edited for conciseness…
josephsl Jul 17, 2020
cb00a1e
Braille Extender settings: edited UI messages for conciseness and com…
josephsl Jul 17, 2020
be7910c
Braille Extender dictionaries: UI message edits.
josephsl Jul 17, 2020
5d7cad5
Braille Extender update check: UI message edits
josephsl Jul 17, 2020
a665831
Merged master
josephsl Jul 20, 2020
63042d2
BRF mode: enable/disable -> toggles in input help mode message
josephsl Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 89 additions & 83 deletions addon/globalPlugins/brailleExtender/__init__.py
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions addon/globalPlugins/brailleExtender/dictionaries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def notifyInvalidTables():
getPathDict("table"): "table",
getPathDict("tmp"): "tmp"
}
msg = _("One or more errors are present in dictionaries tables. Concerned dictionaries: %s. As a result, these dictionaries are not loaded.") % ", ".join([dicts[path] for path in invalidDictTables if path in dicts])
msg = _("One or more errors are present in dictionary tables: %s. As a result, these dictionaries were not loaded.") % ", ".join([dicts[path] for path in invalidDictTables if path in dicts])
wx.CallAfter(gui.messageBox, msg, _("Braille Extender"), wx.OK|wx.ICON_ERROR)

def removeTmpDict():
Expand Down Expand Up @@ -293,7 +293,7 @@ def __init__(self, parent=None, title=_("Edit Dictionary Entry"), textPattern=''
# Translators: This is a label for an edit field in add dictionary entry dialog.
dictText = _("Dictionary")
outTable = configBE.tablesTR[configBE.tablesFN.index(config.conf["braille"]["translationTable"])]
dictChoices = [_("Global"), _("Table")+(" (%s)" % outTable), _("Temporary")]
dictChoices = [_("Global"), _("Table ({})").format(outTable), _("Temporary")]
self.dictRadioBox = sHelper.addItem(wx.RadioBox(self, label=dictText, choices=dictChoices))
self.dictRadioBox.SetSelection(1)
bHelper = gui.guiHelper.ButtonHelper(orientation=wx.HORIZONTAL)
Expand Down Expand Up @@ -339,7 +339,7 @@ def __init__(self, parent=None, title=_("Edit Dictionary Entry"), textPattern=''

def onSeeEntriesClick(self, evt):
outTable = configBE.tablesTR[configBE.tablesFN.index(config.conf["braille"]["translationTable"])]
label = [_("Global dictionary"), _("Table dictionary")+(" (%s)" % outTable), _("Temporary dictionary")][self.dictRadioBox.GetSelection()]
label = [_("Global dictionary"), _("Table dictionary ({})").format(outTable), _("Temporary dictionary")][self.dictRadioBox.GetSelection()]
type_ = self.getType_()
self.Destroy()
gui.mainFrame._popupSettingsDialog(DictionaryDlg, label, type_)
Expand Down Expand Up @@ -374,7 +374,7 @@ def onOk(self, evt):
gui.messageBox(msg, _("Braille Extender"), wx.OK|wx.ICON_ERROR)
return self.textPatternTextCtrl.SetFocus()
if not braillePattern:
msg = _("'Braille representation' field is empty, you must specify something with this opcode. E.g.: %s") % egBRLRepr
msg = _("'Braille representation' field is empty. You must specify something with this opcode. E.g.: %s") % egBRLRepr
gui.messageBox(msg, _("Braille Extender"), wx.OK|wx.ICON_ERROR)
return self.braillePatternTextCtrl.SetFocus()
if not re.match("^[0-8\-]+$", braillePattern):
Expand Down
4 changes: 2 additions & 2 deletions addon/globalPlugins/brailleExtender/oneHandMode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ def process(self, dots):
class SettingsDlg(gui.settingsDialogs.SettingsPanel):

# Translators: title of a dialog.
title = _("One-hand mode")
title = _("One-handed mode")

def makeSettings(self, settingsSizer):
sHelper = gui.guiHelper.BoxSizerHelper(self, sizer=settingsSizer)
self.featureEnabled = sHelper.addItem(wx.CheckBox(self, label=_("&Enable this feature")))
self.featureEnabled = sHelper.addItem(wx.CheckBox(self, label=_("Enable &one-handed mode")))
self.featureEnabled.SetValue(config.conf["brailleExtender"]["oneHandedMode"]["enabled"])
self.featureEnabled.Bind(wx.EVT_CHECKBOX, self.onFeatureEnabled)
choices = list(INPUT_METHODS.values())
Expand Down
Loading