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 /writerperfect/inc | |
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 'writerperfect/inc')
-rw-r--r-- | writerperfect/inc/WPFTResMgr.hxx | 10 | ||||
-rw-r--r-- | writerperfect/inc/strings.hrc | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/writerperfect/inc/WPFTResMgr.hxx b/writerperfect/inc/WPFTResMgr.hxx index 54de1e4f0e06..ccc75246b102 100644 --- a/writerperfect/inc/WPFTResMgr.hxx +++ b/writerperfect/inc/WPFTResMgr.hxx @@ -5,16 +5,16 @@ #include "writerperfectdllapi.h" -#include <tools/resid.hxx> +#include <tools/resmgr.hxx> -struct WRITERPERFECT_DLLPUBLIC WPFTResMgr +struct WRITERPERFECT_DLLPUBLIC WPFTResLocale { - static ResMgr &GetResMgr(); + static std::locale& GetResLocale(); }; -inline OUString WpResId(sal_uInt16 nId) +inline OUString WpResId(const char* pId) { - return ResId(nId, WPFTResMgr::GetResMgr()); + return Translate::get(pId, WPFTResLocale::GetResLocale()); } #endif diff --git a/writerperfect/inc/strings.hrc b/writerperfect/inc/strings.hrc index e18214f511df..9f9b60d8bee8 100644 --- a/writerperfect/inc/strings.hrc +++ b/writerperfect/inc/strings.hrc @@ -10,15 +10,15 @@ #ifndef INCLUDED_WRITERPERFECT_INC_STRINGS_HRC #define INCLUDED_WRITERPERFECT_INC_STRINGS_HRC -#define RES_START 1000 +#define NC_(Context, String) (Context "\004" u8##String) -#define STR_ENCODING_DIALOG_TITLE (RES_START + 1) -#define STR_ENCODING_DIALOG_TITLE_MSWORKS (RES_START + 2) -#define STR_ENCODING_DIALOG_TITLE_MSWRITE (RES_START + 3) -#define STR_ENCODING_DIALOG_TITLE_DOSWORD (RES_START + 4) -#define STR_ENCODING_DIALOG_TITLE_LOTUS (RES_START + 5) -#define STR_ENCODING_DIALOG_TITLE_SYMPHONY (RES_START + 6) -#define STR_ENCODING_DIALOG_TITLE_QUATTROPRO (RES_START + 7) +#define STR_ENCODING_DIALOG_TITLE NC_("STR_ENCODING_DIALOG_TITLE", "Import file") +#define STR_ENCODING_DIALOG_TITLE_MSWORKS NC_("STR_ENCODING_DIALOG_TITLE_MSWORKS", "Import MS Works file") +#define STR_ENCODING_DIALOG_TITLE_MSWRITE NC_("STR_ENCODING_DIALOG_TITLE_MSWRITE", "Import MS Write file") +#define STR_ENCODING_DIALOG_TITLE_DOSWORD NC_("STR_ENCODING_DIALOG_TITLE_DOSWORD", "Import MS Word for DOS file") +#define STR_ENCODING_DIALOG_TITLE_LOTUS NC_("STR_ENCODING_DIALOG_TITLE_LOTUS", "Import Lotus file") +#define STR_ENCODING_DIALOG_TITLE_SYMPHONY NC_("STR_ENCODING_DIALOG_TITLE_SYMPHONY", "Import Symphony file") +#define STR_ENCODING_DIALOG_TITLE_QUATTROPRO NC_("STR_ENCODING_DIALOG_TITLE_QUATTROPRO", "Import Quattro Pro file") #endif |