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

General translation fixes #714

Merged
merged 1 commit into from
Jul 10, 2023
Merged

General translation fixes #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
288 changes: 153 additions & 135 deletions chirp/locale/de.po
View file
Open in desktop

Large diffs are not rendered by default.

286 changes: 154 additions & 132 deletions chirp/locale/el.po
View file
Open in desktop

Large diffs are not rendered by default.

287 changes: 152 additions & 135 deletions chirp/locale/en_US.po
View file
Open in desktop

Large diffs are not rendered by default.

289 changes: 154 additions & 135 deletions chirp/locale/es.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/fr.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/hu.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/it.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/nl.po
View file
Open in desktop

Large diffs are not rendered by default.

289 changes: 154 additions & 135 deletions chirp/locale/pl.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/pt_BR.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/ru.po
View file
Open in desktop

Large diffs are not rendered by default.

289 changes: 154 additions & 135 deletions chirp/locale/tr_TR.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/uk_UA.po
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 153 additions & 135 deletions chirp/locale/zh_CN.po
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion chirp/wxui/clone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,8 @@ def _persist_choices(self):

def _selected_port(self, event):
if self._port.GetStringSelection() == CUSTOM:
port = wx.GetTextFromUser(_('Enter custom port:'), 'Custom Port',
port = wx.GetTextFromUser(_('Enter custom port:'),
_('Custom Port'),
parent=self)
if port:
CUSTOM_PORTS.append(port)
Expand Down
3 changes: 2 additions & 1 deletion chirp/wxui/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,7 @@ def make_menubar(self):

self._last_search_text = ''
find_item = edit_menu.Append(wx.ID_FIND)
edit_menu.SetLabel(wx.ID_FIND, _('Find'))
self.Bind(wx.EVT_MENU, self._menu_find, find_item)

self._find_next_item = wx.NewId()
Expand Down Expand Up @@ -942,7 +943,7 @@ def make_menubar(self):
menu_bar.Append(edit_menu, wx.GetStockLabel(wx.ID_EDIT))
menu_bar.Append(view_menu, '&' + _('View'))
menu_bar.Append(radio_menu, '&' + _('Radio'))
menu_bar.Append(help_menu, wx.GetStockLabel(wx.ID_HELP))
menu_bar.Append(help_menu, _('Help'))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, we're really not supposed to need to do this for these special items, as the GetStockLabel helper accounts for platform differences, like on macos it's common for the "find" issue to be "Find..." but not on others. I think this means it's not translated for your platform, but should be. Which platform are you on? Any chance the formal builds work properly and running from a dev environment does not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is strange. I found this on formal build at two Win10 machines :
image

I'm not sure if this is PL related or Windows related, but definitely something is not working with that configuration. What is interesting rest of the labels (Copy & Paste etc.) were properly pulled via GetStockLabel.

This is how it looks for me:
image

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, yeah, weird. On Linux (where I can easily flip the locale for one program) I get Help translated by stock item, but not Find, when using the es locale. On windows, es has both Find and Help translated. I can replicate your experience on windows with pl. On macos and pl, Help is translated but not find. Ugh!

Okay, I guess this is the best plan then. I'll rebase this and fix the conflicts.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thanks! 👍🏻


return menu_bar

Expand Down
7 changes: 4 additions & 3 deletions chirp/wxui/memedit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,8 @@ def filter_unknowns(items):
ChirpChoiceColumn('mode', self._radio,
valid_modes),
ChirpChoiceColumn('tuning_step', self._radio,
valid_tuning_steps),
valid_tuning_steps,
label=_('Tuning Step')),
ChirpChoiceColumn('skip', self._radio,
valid_skips),
power_col_cls('power', self._radio,
Expand Down Expand Up @@ -1380,7 +1381,7 @@ def _memory_edited(self, event):
if errors:
LOG.warning('Memory failed validation: %s' % mem)
wx.MessageBox(_('Invalid edit: %s') % '; '.join(errors),
'Invalid Entry')
_('Invalid Entry'))
event.Skip()
return
if warnings:
Expand Down Expand Up @@ -2104,7 +2105,7 @@ def __init__(self, memedit, memories, *a, **k):
self._pg = wx.propgrid.PropertyGrid(self._tabs,
style=wx.propgrid.PG_BOLD_MODIFIED)
self._pg.Bind(wx.propgrid.EVT_PG_CHANGED, self._mem_prop_changed)
self._tabs.InsertPage(0, self._pg, 'Values')
self._tabs.InsertPage(0, self._pg, _('Values'))
page_index = 0
self._extra_page = None
self._dv_page = None
Expand Down
3 changes: 2 additions & 1 deletion chirp/wxui/query_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,8 @@ def build(self):
else:
self._limit_onlyworking = True
self._onlyworkingfilter = wx.CheckBox(panel,
label=('Only working repeaters'))
label=_('Only working repeaters')
)
self._onlyworkingfilter.SetValue(self._limit_onlyworking)
CONF.set_bool('workingstatus', self._limit_onlyworking, self._section)
self.Bind(wx.EVT_CHECKBOX, self._select_workingstatus,
Expand Down
Loading