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/source | |
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/source')
-rw-r--r-- | writerperfect/source/common/WPFTResMgr.cxx | 7 | ||||
-rw-r--r-- | writerperfect/source/common/strings.src | 47 |
2 files changed, 3 insertions, 51 deletions
diff --git a/writerperfect/source/common/WPFTResMgr.cxx b/writerperfect/source/common/WPFTResMgr.cxx index 9cc22f365140..c207d25ffca9 100644 --- a/writerperfect/source/common/WPFTResMgr.cxx +++ b/writerperfect/source/common/WPFTResMgr.cxx @@ -2,14 +2,13 @@ #include "WPFTResMgr.hxx" -#include <tools/resmgr.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -ResMgr &WPFTResMgr::GetResMgr() +std::locale &WPFTResLocale::GetResLocale() { - static ResMgr *const pResMgr(ResMgr::CreateResMgr("writerperfect", Application::GetSettings().GetUILanguageTag())); - return *pResMgr; + static std::locale loc(Translate::Create("wpt", Application::GetSettings().GetUILanguageTag())); + return loc; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/common/strings.src b/writerperfect/source/common/strings.src deleted file mode 100644 index fb9b0bad0e35..000000000000 --- a/writerperfect/source/common/strings.src +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "strings.hrc" - -String STR_ENCODING_DIALOG_TITLE -{ - Text[en-US] = "Import file"; -}; - -String STR_ENCODING_DIALOG_TITLE_MSWORKS -{ - Text[en-US] = "Import MS Works file"; -}; - -String STR_ENCODING_DIALOG_TITLE_MSWRITE -{ - Text[en-US] = "Import MS Write file"; -}; - -String STR_ENCODING_DIALOG_TITLE_DOSWORD -{ - Text[en-US] = "Import MS Word for DOS file"; -}; - -String STR_ENCODING_DIALOG_TITLE_LOTUS -{ - Text[en-US] = "Import Lotus file"; -}; - -String STR_ENCODING_DIALOG_TITLE_SYMPHONY -{ - Text[en-US] = "Import Symphony file"; -}; - -String STR_ENCODING_DIALOG_TITLE_QUATTROPRO -{ - Text[en-US] = "Import Quattro Pro file"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |