Author: jani
Date: Tue Mar 26 10:31:47 2013
New Revision: 1461051
URL: http://svn.apache.org/r1461051
Log:
current makefiles expect xx-XX and not xx_XX for languages
Modified:
openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx
openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx
openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx
openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx
openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx
Modified: openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx?rev=1461051&r1=1461050&r2=1461051&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConDB.cxx Tue Mar 26
10:31:47 2013
@@ -58,7 +58,7 @@ void convert_db::execute()
for (; (i = msFields[1].find('\\')) != std::string::npos;)
msFields[1][i] = '/';
- // handle en_US or lang
+ // handle en-US or lang
mcMemory.loadEntryKey(miLineNo, msFields[1], newKey, msFields[10],
msFields[10], false);
}
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx?rev=1461051&r1=1461050&r2=1461051&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gHandler.cxx Tue Mar 26
10:31:47 2013
@@ -349,7 +349,7 @@ void handler::showManual()
"genLang (c)2013 by Apache Software Foundation\n"
"=============================================\n"
"As part of the L10N framework for Apache Open Office (AOO),\n"
- "genLang extracts en_US texts sources of the following types:\n"
+ "genLang extracts en-US texts sources of the following types:\n"
" .xrm, .xhp, .xcu, .xcs, .ulf, .tree, .src, .prop and .po\n"
"and merges with .po files in different languages.\n"
"genLang merges .po files with AOO sources to add languages.\n"
@@ -442,10 +442,10 @@ void handler::showManual()
void handler::loadL10MEM()
{
std::string sMod = msModuleName + ".po";
- std::string sLoad = msPoDir + "en_US/";
+ std::string sLoad = msPoDir + "en-US/";
- // load texts from en_US po file (master)
+ // load texts from en-US po file (master)
{
// tell system
l10nMem::showDebug("gLang loading master text from file " + sLoad + sMod);
@@ -497,4 +497,4 @@ void handler::readFileWithSources()
}
fInput.close();
-}
\ No newline at end of file
+}
Modified: openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx?rev=1461051&r1=1461050&r2=1461051&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gL10nMem.cxx Tue Mar 26
10:31:47 2013
@@ -244,11 +244,11 @@ void l10nMem_impl::save(l10nMem& cMem, c
//JIX save HANDLE KID
- // Save en_US
+ // Save en-US
{
convert_gen savePo(cMem, sTargetDir, sTargetDir, sFileName);
- savePo.startSave("en_US", sFileName);
+ savePo.startSave("en-US", sFileName);
for (iE = 1; iE < iEsize; ++iE)
{
l10nMem_enus_entry& cE = mcDb.mcENUSlist[iE];
@@ -429,7 +429,7 @@ void l10nMem_impl::convEntryKey(int
return;
}
- // Loop through all potential en_US entries
+ // Loop through all potential en-US entries
for (iCandidate = -1, i = 0; i < iSize; ++i)
{
l10nMem_enus_entry& curE = mcDb.mcENUSlist[ivEntryList[i]];
Modified: openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx?rev=1461051&r1=1461050&r2=1461051&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gL10nMem.hxx Tue Mar 26
10:31:47 2013
@@ -60,7 +60,7 @@ class l10nMem_enus_entry
std::string msKey; // key in po file and source
file
std::string msUpperKey; // key converted to uppercase
(for compare)
- std::string msText; // en_US text from source file
+ std::string msText; // en-US text from source file
l10nMem::ENTRY_STATE meState; // status information
int miFileInx; // index of file name
int miLineNo; // line number
Modified: openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx?rev=1461051&r1=1461050&r2=1461051&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gL10nMemDB.cxx Tue Mar 26
10:31:47 2013
@@ -173,16 +173,16 @@ void l10nMem_db::setLanguage(const std::
mbConvertMode = bConvert;
miCurFileInx = 0;
- // With no languages selected only en_US is generated
+ // With no languages selected only en-US is generated
if (!sLanguage.size())
{
miCurLangInx = 0;
return;
}
- // en_US is loaded as master and cannot be loaded again
- if (sLanguage == "en_US")
- throw l10nMem::showError("en_US is loaded automatically");
+ // en-US is loaded as master and cannot be loaded again
+ if (sLanguage == "en-US")
+ throw l10nMem::showError("en-US is loaded automatically");
// check if language is already loaded
iSize = mcLangList.size();
