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 /l10ntools/source/localize.cxx | |
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 'l10ntools/source/localize.cxx')
-rw-r--r-- | l10ntools/source/localize.cxx | 113 |
1 files changed, 70 insertions, 43 deletions
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index b977562fba2f..42c6184496fb 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -83,8 +83,17 @@ void handleCommand( const OString& rInPath, const OString& rOutPath, const OString& rExecutable) { - OStringBuffer buf(OString(getenv("WORKDIR_FOR_BUILD"))); - buf.append("/LinkTarget/Executable/"); + OStringBuffer buf; + if (rExecutable == "uiex" || rExecutable == "hrcex") + { + buf.append(OString(getenv("SRC_ROOT"))); + buf.append("/solenv/bin/"); + } + else + { + buf.append(OString(getenv("WORKDIR_FOR_BUILD"))); + buf.append("/LinkTarget/Executable/"); + } buf.append(rExecutable); buf.append(" -i "); buf.append(rInPath); @@ -143,9 +152,22 @@ void InitPoFile( aPoOutPut.close(); } -bool handleFile( - const OString& rProject, const OUString& rUrl, - const OString& rPotDir, bool bInitPoFile ) +bool fileExists(const OString& fileName) +{ + FILE *f = fopen(fileName.getStr(), "r"); + + if (f != nullptr) + { + fclose(f); + return true; + } + + return false; +} + +OString gDestRoot; + +bool handleFile(const OString& rProject, const OUString& rUrl, const OString& rPotDir) { struct Command { OUStringLiteral extension; @@ -153,8 +175,7 @@ bool handleFile( bool positive; }; static Command const commands[] = { - { OUStringLiteral(".src"), "transex3", false }, - { OUStringLiteral(".hrc"), "transex3", true }, + { OUStringLiteral(".hrc"), "hrcex", false }, { OUStringLiteral(".ulf"), "ulfex", false }, { OUStringLiteral(".xcu"), "cfgex", false }, { OUStringLiteral(".xrm"), "xrmex", false }, @@ -182,13 +203,35 @@ bool handleFile( } sInPath = OUStringToOString( sInPathTmp, RTL_TEXTENCODING_UTF8 ); } - OString sOutPath = rPotDir.concat(".pot"); + OString sOutPath; + if (commands[i].executable == "uiex" || commands[i].executable == "hrcex") + sOutPath = gDestRoot + "/" + rProject + "/messages.pot"; + else + sOutPath = rPotDir.concat(".pot"); - if ( bInitPoFile ) - { + if (!fileExists(sOutPath)) InitPoFile(rProject, sInPath, rPotDir, sOutPath); - } handleCommand(sInPath, sOutPath, commands[i].executable); + + { + //Delete pot file if it contain only the header + PoIfstream aPOStream(sOutPath); + PoEntry aPO; + aPOStream.readEntry( aPO ); + bool bDel = aPOStream.eof(); + aPOStream.close(); + if (bDel) + { + if ( system(OString("rm " + sOutPath).getStr()) != 0 ) + { + cerr + << "Error: Cannot remove entryless pot file: " + << sOutPath << "\n"; + throw false; //TODO + } + } + } + return true; } break; @@ -206,40 +249,13 @@ void handleFilesOfDir( typedef std::vector<OUString>::const_iterator citer_t; - bool bFirstLocFile = true; ///< First file in directory which needs localization - for( citer_t aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt ) - { - if (handleFile( rProject, *aIt, rPotDir, bFirstLocFile)) - { - bFirstLocFile = false; - } - } - - if( !bFirstLocFile ) - { - //Delete pot file if it contain only the header - OString sPotFile = rPotDir.concat(".pot"); - PoIfstream aPOStream( sPotFile ); - PoEntry aPO; - aPOStream.readEntry( aPO ); - bool bDel = aPOStream.eof(); - aPOStream.close(); - if( bDel ) - { - if ( system(OString("rm " + sPotFile).getStr()) != 0 ) - { - cerr - << "Error: Cannot remove entryless pot file: " - << sPotFile << "\n"; - throw false; //TODO - } - } - } + handleFile(rProject, *aIt, rPotDir); } bool includeProject(const OString& rProject) { static const char *projects[] = { + "include", "accessibility", "avmedia", "basctl", @@ -373,9 +389,19 @@ void handleDirectory( } } + OString aPotDir(rPotDir); if( !aFileNames.empty() ) { - handleFilesOfDir( aFileNames, rProject, rPotDir ); + OString aProject(rProject); + if (aProject == "include" && nLevel > 1) + { + aProject = aPotDir.copy(aPotDir.lastIndexOf('/') + 1); + aPotDir = aPotDir.copy(0, aPotDir.lastIndexOf("include")) + aProject + "/messages"; + } + if (aProject != "include") + { + handleFilesOfDir(aFileNames, aProject, aPotDir); + } } if (dir.close() != osl::FileBase::E_None) { @@ -386,7 +412,7 @@ void handleDirectory( //Remove empty pot directory OUString sPoPath = OStringToOUString( - rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8); + aPotDir.copy(0,aPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8); OUString sPoUrl; if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl) != osl::FileBase::E_None) @@ -427,7 +453,8 @@ void handleProjects(char * sSourceRoot, char const * sDestRoot) << "\n"; throw false; //TODO } - handleDirectory(rootUrl, 0, OString(), OString(sDestRoot)); + gDestRoot = OString(sDestRoot); + handleDirectory(rootUrl, 0, OString(), gDestRoot); } } |