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 /forms/source/runtime | |
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 'forms/source/runtime')
-rw-r--r-- | forms/source/runtime/formoperations.cxx | 19 | ||||
-rw-r--r-- | forms/source/runtime/formoperations.hxx | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index d291bfb4649d..340b4518f7d9 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -22,7 +22,7 @@ #include "formoperations.hxx" #include "frm_strings.hxx" #include "frm_resource.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "services.hxx" #include <com/sun/star/ucb/AlreadyInitializedException.hpp> @@ -771,12 +771,12 @@ namespace frm default: { - sal_uInt16 nErrorResourceId = RID_STR_FEATURE_UNKNOWN; + const char* pErrorResourceId = RID_STR_FEATURE_UNKNOWN; if ( lcl_requiresArguments( _nFeature ) ) - nErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS; + pErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS; else if ( !lcl_isExecutableFeature( _nFeature ) ) - nErrorResourceId = RID_STR_FEATURE_NOT_EXECUTABLE; - throw IllegalArgumentException( FRM_RES_STRING( nErrorResourceId ), *this, 1 ); + pErrorResourceId = RID_STR_FEATURE_NOT_EXECUTABLE; + throw IllegalArgumentException( FRM_RES_STRING( pErrorResourceId ), *this, 1 ); } } // switch } @@ -1695,7 +1695,7 @@ namespace frm template < typename FunctObj > - void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 _nErrorResourceId ) const + void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const { try { @@ -1704,12 +1704,11 @@ namespace frm #if HAVE_FEATURE_DBCONNECTIVITY catch( const SQLException& ) { - if ( !_nErrorResourceId ) - // no information to prepend + if (!pErrorResourceId) // no information to prepend throw; SQLExceptionInfo aInfo( ::cppu::getCaughtException() ); - OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); + OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) ); aInfo.prepend( sAdditionalError ); aInfo.doThrow(); } @@ -1717,7 +1716,7 @@ namespace frm catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); + OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) ); throw WrappedTargetException( sAdditionalError, *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } } diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index db76e57f7df8..425e789f8419 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -290,11 +290,11 @@ namespace frm @param f a functionoid with no arguments to do the work - @param _nErrorResourceId + @param pErrorResourceId the id of the resources string to use as error message */ template < typename FunctObj > - void impl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 _nErrorResourceId ) const; + void impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const; // functionoid to call appendOrderByColumn class impl_appendOrderByColumn_throw |