Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove platform-specific translations support

Browse Source 
As shown by the fact that no other platform-specific translations were
ever added since the initial version of locale/msw/it.po added way back
in 4d931bcca0 (Translate '&Help' to '&' for italian Windows only,
2005-08-12), this is not especially useful, so just handle this
particular case specially in wxGetStockLabel() and remove support for
platform-specific translations.

This allows to simplify the makefiles and the catalog loading code as
there is no need to deal with the files in subdirectories any more.
This commit is contained in:
Vadim Zeitlin
2021-02-02 17:14:37 +01:00
parent b5282c682f
commit e539cb69bb
9 changed files with 31 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/internat/internat.cpp
View File

@@ -32,6 +32,7 @@
#include "wx/file.h"
#include "wx/log.h"
#include "wx/cmdline.h"
#include "wx/platinfo.h"
#ifndef wxHAS_IMAGES_IN_RESOURCES
#include "../sample.xpm"
@@ -298,10 +299,8 @@ MyFrame::MyFrame(wxLocale& locale)
file_menu->Append(INTERNAT_TEST, _("&Test locale availability...\tCtrl-T"));
file_menu->AppendSeparator();
// since wxID_ABOUT and wxID_EXIT are stock IDs they will automatically get
// translated help strings; nice isn't it?
file_menu->Append(wxID_ABOUT, _("&About"));
file_menu->AppendSeparator();
// since wxID_EXIT is a stock ID it will automatically get a translated help
// string; nice isn't it?
file_menu->Append(wxID_EXIT, _("E&xit"));
wxMenu *test_menu = new wxMenu;
@@ -327,11 +326,20 @@ MyFrame::MyFrame(wxLocale& locale)
macro_menu->Append(INTERNAT_MACRO_8, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 1));
macro_menu->Append(INTERNAT_MACRO_9, wxGETTEXT_IN_CONTEXT_PLURAL("context_2", "sing", "plur", 2));
wxMenu *help_menu = new wxMenu;
help_menu->Append(wxID_ABOUT, _("&About"));
wxMenuBar *menu_bar = new wxMenuBar;
// Using stock label here means that it will be automatically translated.
menu_bar->Append(file_menu, wxGetStockLabel(wxID_FILE));
menu_bar->Append(test_menu, _("&Test"));
menu_bar->Append(macro_menu, _("&Macro"));
// We could have used wxGetStockLabel(wxID_HELP) here too, but show the
// special case of "Help" menu: it has a special, Windows-specific
// translation for some languages. Note that normally we would actually use
// it only under MSW, we're doing it here unconditionally just for
// demonstration purposes.
menu_bar->Append(help_menu, wxGETTEXT_IN_CONTEXT("standard Windows menu", "&Help"));
SetMenuBar(menu_bar);
// this demonstrates RTL support in wxStatusBar: