diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-06-11 20:56:30 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:50 +0100 |
commit | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch) | |
tree | fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /vcl/unx | |
parent | fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff) |
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
results in inserting the english original so something can be found, now the
standard fallback of using the english original from the source key is used, so
partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
com::sun::star::resource::OfficeResourceLoader
com::sun::star::resource::XResourceBundleLoader
com::sun::star::resource::XResourceBundle
when translating strings via uno apis
com.sun.star.resource.StringResourceWithLocation
can continue to be used
Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/print/prtsetup.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/resourceprovider.cxx | 23 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 16 | ||||
-rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.cxx | 20 | ||||
-rw-r--r-- | vcl/unx/kde4/KDE4FilePicker.hxx | 2 |
9 files changed, 36 insertions, 49 deletions
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 40a12e5e6aa1..d400e1d8178b 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -47,7 +47,7 @@ #include <vcl/pdfwriter.hxx> #include "printerinfomanager.hxx" #include <vcl/settings.hxx> -#include "svids.hrc" +#include "strings.hrc" #include "saldatabasic.hxx" #include "unx/genprn.h" #include "unx/geninst.h" diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 02684af1e765..4d24260e8fbd 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -19,7 +19,7 @@ #include "prtsetup.hxx" #include "svdata.hxx" -#include "svids.hrc" +#include "strings.hrc" #include "osl/thread.h" diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 8140019c7e27..e176045ddba2 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -66,7 +66,7 @@ #include <com/sun/star/uno/Exception.hpp> #include "svdata.hxx" -#include "svids.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "impbmp.hxx" diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index c4da0258b8c6..349247c9235a 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -22,7 +22,7 @@ #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#include "svids.hrc" +#include "strings.hrc" #include "svdata.hxx" #include "gtk/fpicker/SalGtkPicker.hxx" @@ -34,7 +34,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; static const struct { sal_Int32 ctrlId; - sal_Int16 resId; + const char *resId; } CtrlIdToResIdTable[] = { { CHECKBOX_AUTOEXTENSION, STR_FPICKER_AUTO_EXTENSION }, { CHECKBOX_PASSWORD, STR_FPICKER_PASSWORD }, @@ -57,30 +57,23 @@ static const struct { FILE_PICKER_FILE_TYPE, STR_FPICKER_TYPE } }; -static sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) +static const char* CtrlIdToResId( sal_Int32 aControlId ) { for (auto & i : CtrlIdToResIdTable) { if ( i.ctrlId == aControlId ) return i.resId; } - return -1; + return nullptr; } OUString SalGtkPicker::getResString( sal_Int32 aId ) { OUString aResString; - try - { - // translate the control id to a resource id - sal_Int16 aResId = CtrlIdToResId( aId ); - if ( aResId > -1 ) - aResString = ResId(aResId, *ImplGetResMgr()); - } - catch(...) - { - } - + // translate the control id to a resource id + const char *pResId = CtrlIdToResId( aId ); + if (pResId) + aResString = VclResId(pResId); return aResString.replace('~', '_'); } diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 0e2e572de0f3..e64f68266d01 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -56,7 +56,8 @@ #include <dlfcn.h> #include <vcl/salbtype.hxx> #include <impbmp.hxx> -#include <svids.hrc> +#include <strings.hrc> +#include <bitmaps.hlst> #include <sal/macros.h> #include <basegfx/range/b2ibox.hxx> @@ -633,15 +634,14 @@ gboolean ensure_dbus_setup( gpointer data ) gdk_x11_window_set_utf8_property( gdkWindow, "_GTK_APP_MENU_OBJECT_PATH", "/org/libreoffice/menus/appmenu" ); //app menu, to-do translations, block normal menus when active, honor use appmenu settings - ResMgr* pMgr = ImplGetResMgr(); - if( pMgr && !bDesktopIsUnity ) + if (!bDesktopIsUnity ) { GMenu *menu = g_menu_new (); GMenuItem* item; GMenu *firstsubmenu = g_menu_new (); - OString sNew(OUStringToOString(ResId(SV_BUTTONTEXT_NEW, *pMgr), + OString sNew(OUStringToOString(VclResId(SV_BUTTONTEXT_NEW), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sNew.getStr(), "app.New"); @@ -653,7 +653,7 @@ gboolean ensure_dbus_setup( gpointer data ) GMenu *secondsubmenu = g_menu_new (); - OString sPreferences(OUStringToOString(ResId(SV_STDTEXT_PREFERENCES, *pMgr), + OString sPreferences(OUStringToOString(VclResId(SV_STDTEXT_PREFERENCES), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sPreferences.getStr(), "app.OptionsTreeDialog"); @@ -665,21 +665,21 @@ gboolean ensure_dbus_setup( gpointer data ) GMenu *thirdsubmenu = g_menu_new (); - OString sHelp(OUStringToOString(ResId(SV_BUTTONTEXT_HELP, *pMgr), + OString sHelp(OUStringToOString(VclResId(SV_BUTTONTEXT_HELP), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sHelp.getStr(), "app.HelpIndex"); g_menu_append_item( thirdsubmenu, item ); g_object_unref(item); - OString sAbout(OUStringToOString(ResId(SV_STDTEXT_ABOUT, *pMgr), + OString sAbout(OUStringToOString(VclResId(SV_STDTEXT_ABOUT), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sAbout.getStr(), "app.About"); g_menu_append_item( thirdsubmenu, item ); g_object_unref(item); - OString sQuit(OUStringToOString(ResId(SV_MENU_MAC_QUITAPP, *pMgr), + OString sQuit(OUStringToOString(VclResId(SV_MENU_MAC_QUITAPP), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sQuit.getStr(), "app.Quit"); diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 716be616af0b..6f16984ba6d0 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -23,7 +23,7 @@ #include <sal/log.hxx> #include <window.h> -#include <svids.hrc> +#include <strings.hrc> static bool bUnityMode = false; diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 5b746b623aaa..a329001fe471 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -64,7 +64,8 @@ #include <dlfcn.h> #include <vcl/salbtype.hxx> #include <impbmp.hxx> -#include <svids.hrc> +#include <strings.hrc> +#include <bitmaps.hlst> #include <sal/macros.h> #include <basegfx/range/b2ibox.hxx> @@ -656,15 +657,14 @@ gboolean ensure_dbus_setup( gpointer data ) pSalFrame->m_nHudAwarenessId = hud_awareness_register( pSessionBus, aDBusMenubarPath, hud_activated, pSalFrame, nullptr, nullptr ); //app menu, to-do translations, block normal menus when active, honor use appmenu settings - ResMgr* pMgr = ImplGetResMgr(); - if( pMgr && !bDesktopIsUnity ) + if (!bDesktopIsUnity) { GMenu *menu = g_menu_new (); GMenuItem* item; GMenu *firstsubmenu = g_menu_new (); - OString sNew(OUStringToOString(ResId(SV_BUTTONTEXT_NEW, *pMgr), + OString sNew(OUStringToOString(VclResId(SV_BUTTONTEXT_NEW), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sNew.getStr(), "app.New"); @@ -676,7 +676,7 @@ gboolean ensure_dbus_setup( gpointer data ) GMenu *secondsubmenu = g_menu_new (); - OString sPreferences(OUStringToOString(ResId(SV_STDTEXT_PREFERENCES, *pMgr), + OString sPreferences(OUStringToOString(VclResId(SV_STDTEXT_PREFERENCES), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sPreferences.getStr(), "app.OptionsTreeDialog"); @@ -688,21 +688,21 @@ gboolean ensure_dbus_setup( gpointer data ) GMenu *thirdsubmenu = g_menu_new (); - OString sHelp(OUStringToOString(ResId(SV_BUTTONTEXT_HELP, *pMgr), + OString sHelp(OUStringToOString(VclResId(SV_BUTTONTEXT_HELP), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sHelp.getStr(), "app.HelpIndex"); g_menu_append_item( thirdsubmenu, item ); g_object_unref(item); - OString sAbout(OUStringToOString(ResId(SV_STDTEXT_ABOUT, *pMgr), + OString sAbout(OUStringToOString(VclResId(SV_STDTEXT_ABOUT), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sAbout.getStr(), "app.About"); g_menu_append_item( thirdsubmenu, item ); g_object_unref(item); - OString sQuit(OUStringToOString(ResId(SV_MENU_MAC_QUITAPP, *pMgr), + OString sQuit(OUStringToOString(VclResId(SV_MENU_MAC_QUITAPP), RTL_TEXTENCODING_UTF8).replaceFirst("~", "_")); item = g_menu_item_new(sQuit.getStr(), "app.Quit"); diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 9d719bebe032..c43e559147bd 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <vcl/fpicker.hrc> +#include <fpicker/fpicker.hrc> #include <vcl/svapp.hxx> #include <vcl/sysdata.hxx> #include <vcl/syswin.hxx> @@ -58,7 +58,7 @@ #include "unx/geninst.h" -#include "svids.hrc" +#include "strings.hrc" // The dialog should check whether LO also supports the protocol // provided by KIO, and KFileWidget::dirOperator() is only 4.3+ . @@ -508,20 +508,14 @@ OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId) return toOUString(label); } -QString KDE4FilePicker::getResString( sal_Int16 aRedId ) +QString KDE4FilePicker::getResString(const char *pResId) { QString aResString; - if( aRedId < 0 ) + if (pResId == nullptr) return aResString; - try - { - aResString = toQString(ResId(aRedId, *ImplGetResMgr())); - } - catch(...) - { - } + aResString = toQString(VclResId(pResId)); return aResString.replace('~', '&'); } @@ -529,7 +523,7 @@ QString KDE4FilePicker::getResString( sal_Int16 aRedId ) void KDE4FilePicker::addCustomControl(sal_Int16 controlId) { QWidget* widget = nullptr; - sal_Int32 resId = -1; + const char* resId = nullptr; switch (controlId) { @@ -723,7 +717,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args ) _dialog->setOperationMode( operationMode ); - sal_Int16 resId = -1; + const char *resId = nullptr; switch (_dialog->operationMode()) { case KFileDialog::Opening: diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 96d94a9868e2..fb714a50b704 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -243,7 +243,7 @@ private: //add a custom control widget to the file dialog void addCustomControl(sal_Int16 controlId); - static QString getResString( sal_Int16 aRedId ); + static QString getResString(const char* pRedId); private Q_SLOTS: void cleanupProxy(); |