summaryrefslogtreecommitdiff
path: root/l10ntools
diff options
context:
space:
mode:
Diffstat (limited to 'l10ntools')
-rwxr-xr-xl10ntools/scripts/po2lo33
-rw-r--r--l10ntools/source/renewpo.cxx139
2 files changed, 93 insertions, 79 deletions
diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo
index 579699102710..6303c63a6fa7 100755
--- a/l10ntools/scripts/po2lo
+++ b/l10ntools/scripts/po2lo
@@ -41,7 +41,7 @@ class Entry:
"""Represents a single line in an SDF file."""
def __init__(self, items):
- self.has_translation = None;
+ self.has_po = None
self.items = items # list of 15 fields
path = self.items[1].split('\\')
self.po = "%s/%s/%s.po" % (options.input.replace('\\', '/'), self.items[0], "/".join(path[:-1]))
@@ -67,15 +67,17 @@ class Entry:
self.items[9] = options.language
self.items[2] = ""
- self.has_translation = False
+ self.has_po = False
for idx, key in self.keys:
try:
- if translations.data[(self.po, key)][1]:
+ self.items[8] = str(translations.snumber[(self.po, key)])
+ self.has_po = True
+ (text, fuzzy) = translations.data[(self.po, key)]
+ if fuzzy:
self.items[2] += "1"
else:
self.items[2] += "0"
- self.items[idx] = translations.data[(self.po, key)][0]
- self.has_translation = True
+ self.items[idx] = text
self.items[14] = "2002-02-02 02:02:02"
except KeyError:
@@ -103,9 +105,10 @@ class Template:
sock = xopen(options.output, "w", encoding='utf-8')
for line in self.lines:
- sock.write("\t".join(line.items))
+ temp = "\t".join(line.items)
line.translate(translations)
- if line.has_translation:
+ if line.has_po:
+ sock.write(temp)
sock.write("\t".join(line.items)+"\r\n")
sock.close()
@@ -114,6 +117,8 @@ class Translations:
def __init__(self):
self.data = {}
+ self.snumber = {}
+ counter = 0
for root, dirs, files in os.walk(options.input):
for file in files:
path = "%s/%s" % (root, file)
@@ -125,16 +130,17 @@ class Translations:
for line in sock:
if line.startswith("#: "):
key = line.strip()[3:]
+ fuzzy = False
elif line.startswith("#, fuzzy"):
fuzzy = True
+ elif line.startswith("msgid "):
+ counter = counter + 1
+ self.setserialnumber(path, key, counter)
elif line.startswith("msgstr "):
trans = line.strip()[8:-1]
if len(trans):
self.setdata(path, key, trans, fuzzy)
- if fuzzy:
- fuzzy = False
- else:
- multiline = False
+ multiline = False
else:
buf = []
buf.append(trans)
@@ -143,8 +149,6 @@ class Translations:
buf.append(line.strip()[1:-1])
elif multiline and not len(line.strip()) and len("".join(buf)):
self.setdata(path, key, "".join(buf),fuzzy)
- if fuzzy:
- fuzzy = False
buf = []
multiline = False
if multiline and len("".join(buf)):
@@ -162,6 +166,9 @@ class Translations:
s = s.replace('\\\\', '\\')
self.data[(path.replace('\\', '/'), key)] = ( s , fuzzy )
+ def setserialnumber(self, path, key, number):
+ self.snumber[(path.replace('\\', '/'), key)] = ( number )
+
def escape_help_text(self, text):
"""Escapes the help text as it would be in an SDF file."""
diff --git a/l10ntools/source/renewpo.cxx b/l10ntools/source/renewpo.cxx
index 32d19d594c09..a9f3321d2c4b 100644
--- a/l10ntools/source/renewpo.cxx
+++ b/l10ntools/source/renewpo.cxx
@@ -12,6 +12,7 @@
#include <dirent.h>
#include <string>
#include <vector>
+#include <map>
#include <osl/file.hxx>
#include <rtl/string.hxx>
@@ -20,18 +21,18 @@
using namespace std;
-//Check wheather the two entry are the same but in different languages
-bool IsSameEntry(const OString& rFirstEntry,const OString& rSecEntry)
+bool isInSameFile( const OString& rFirstLine, const OString& rSecondLine)
{
- for(int i = PoEntry::PROJECT; i<=PoEntry::LOCALID;++i)
- {
- if ( rFirstEntry.getToken(i,'\t') != rSecEntry.getToken(i,'\t') &&
- i != PoEntry::DUMMY)
- return false;
- }
- return true;
+ const OString rFirstSource =
+ rFirstLine.getToken(PoEntry::SOURCEFILE,'\t');
+ const OString rSecondSource =
+ rSecondLine.getToken(PoEntry::SOURCEFILE,'\t');
+ return
+ rFirstSource.copy(0,rFirstSource.lastIndexOf("\\")) ==
+ rSecondSource.copy(0,rSecondSource.lastIndexOf("\\"));
}
+
//Get path of po file
OString GetPath(const OString& rPath, const OString& rLine)
{
@@ -57,8 +58,9 @@ OString DelLocalId(const OString& rLine)
}
//Renew po files of the actual language
-void HandleLanguage(struct dirent* pLangEntry, const OString& rPath,
- const OString& rpo2loPath, const OString& rSDFPath)
+void HandleLanguage(struct dirent* pLangEntry, const OString& rOldPath,
+ const OString& rNewPath, const OString& rpo2loPath,
+ const OString& rSDFPath)
{
const OString LangEntryName = pLangEntry->d_name;
@@ -83,35 +85,69 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath,
const OString SDFFileName =
OUStringToOString(aTempPath, RTL_TEXTENCODING_UTF8);
system( (rpo2loPath +
- " -i " + rPath + "/" + LangEntryName +
+ " -i " + rOldPath + "/" + LangEntryName +
" -o " + SDFFileName +
" -l " + LangEntryName +
" -t " + rSDFPath).getStr());
cout << "Language sdf is ready!" << endl;
- PoOfstream aNewPo;
+ //Store info for po entries
ifstream aSDFInput(SDFFileName.getStr());
+ map<sal_Int32,pair<OString,OString> > aPoInfos;
string s;
getline(aSDFInput,s);
- OString sLine = OString(s.data(),s.length());
while(!aSDFInput.eof())
{
- OString sActUnTrans = sLine;
- const OString sPath = rPath + "/"+ LangEntryName;
- const OString sActSourcePath = GetPath(sPath,sActUnTrans);
+ //Get strings belong to one po entry and store
+ const OString sActUnTrans = OString(s.data(),s.length());
+ if( sActUnTrans.getToken(PoEntry::LANGUAGEID,'\t')=="ast" ) throw;
+ getline(aSDFInput,s);
+ const OString sActTrans = OString(s.data(),s.length());
+
+ if(!(aPoInfos.insert( pair<sal_Int32,pair<OString,OString> >(
+ sActTrans.getToken(PoEntry::WIDTH,'\t').toInt32(),
+ pair<OString,OString>(sActUnTrans,sActTrans))).second))
+ {
+ cerr << "Error: faild to insert into map!" << '\n';
+ throw;
+ }
+ getline(aSDFInput,s);
+ }
+
+ //Close and remove sdf file
+ aSDFInput.close();
+ if (osl::File::remove(aTempUrl) != osl::FileBase::E_None)
+ {
+ cerr << "Warning: failure removing temporary " << aTempUrl << '\n';
+ }
+
+ //Construct and write out po entries
+ PoOfstream aNewPo;
+ for( map<sal_Int32,pair<OString,OString> >::iterator
+ pActInfo=aPoInfos.begin(); pActInfo!=aPoInfos.end(); ++pActInfo )
+ {
//Make new po file and add header
- if (!aNewPo.isOpen())
+ if ( pActInfo==aPoInfos.begin() ||
+ !isInSameFile(((--pActInfo)++)->second.first,pActInfo->second.first) )
{
- const OString sNewPoFileName = sActSourcePath + ".po_tmp";
+ if( pActInfo!=aPoInfos.begin() )
+ aNewPo.close();
+
+ const OString sNewPoFileName =
+ GetPath(rNewPath + "/" +LangEntryName,pActInfo->second.first) +
+ ".po";
+ system(("mkdir -p " + sNewPoFileName.copy(0,sNewPoFileName.lastIndexOf("/"))).getStr());
aNewPo.open(sNewPoFileName);
if (!aNewPo.isOpen())
{
cerr
- << "Cannot open temp file for new po: "
+ << "Cannot open new po file: "
<< sNewPoFileName.getStr() << endl;
return;
}
- const OString sOldPoFileName = sActSourcePath + ".po";
+ const OString sOldPoFileName =
+ GetPath(rOldPath + "/" +LangEntryName,pActInfo->second.first) +
+ ".po";
ifstream aOldPo(sOldPoFileName.getStr());
if (!aOldPo.is_open())
{
@@ -124,19 +160,7 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath,
aOldPo.close();
}
- //Set PoEntry and write out
- getline(aSDFInput,s);
- OString sActTrans;
- if (!aSDFInput.eof() &&
- IsSameEntry(sActUnTrans,sLine = OString(s.data(),s.length())))
- {
- sActTrans = sLine;
- getline(aSDFInput,s);
- }
- else
- {
- sActTrans ="";
- }
+ //Write out po entries
const PoEntry::TYPE vInitializer[] =
{ PoEntry::TTEXT, PoEntry::TQUICKHELPTEXT, PoEntry::TTITLE };
const vector<PoEntry::TYPE> vTypes( vInitializer,
@@ -144,28 +168,28 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath,
unsigned short nDummyBit = 0;
for( unsigned short nIndex=0; nIndex<vTypes.size(); ++nIndex )
{
- if (!sActUnTrans.getToken(vTypes[nIndex],'\t').isEmpty())
+ if (!pActInfo->second.first.getToken(vTypes[nIndex],'\t').isEmpty())
{
/**Because of xrmex there are duplicated id's,
- only use this if xrmex have already fixed*/
+ only use this if xrmex have already fixed*/
const OString sSource =
- sActUnTrans.getToken(PoEntry::SOURCEFILE,'\t');
+ pActInfo->second.first.getToken(PoEntry::SOURCEFILE,'\t');
const OString sEnding =
sSource.copy(sSource.getLength()-4, 4);
- if (sActUnTrans.getToken(PoEntry::GROUPID,'\t')==
- sActUnTrans.getToken(PoEntry::LOCALID,'\t') &&
+ if (pActInfo->second.first.getToken(PoEntry::GROUPID,'\t')==
+ pActInfo->second.first.getToken(PoEntry::LOCALID,'\t') &&
( sEnding == ".xrm" || sEnding == ".xml" ))
{
- sActUnTrans = DelLocalId(sActUnTrans);
+ pActInfo->second.first = DelLocalId(pActInfo->second.first);
}
try
{
- PoEntry aPE(sActUnTrans, vTypes[nIndex]);
+ PoEntry aPE(pActInfo->second.first, vTypes[nIndex]);
const OString sActStr =
- sActTrans.getToken(vTypes[nIndex],'\t');
+ pActInfo->second.second.getToken(vTypes[nIndex],'\t');
aPE.setMsgStr(sActStr);
aPE.setFuzzy( sActStr.isEmpty() ? false :
- static_cast<bool>(sActTrans.getToken(PoEntry::DUMMY,'\t').
+ static_cast<bool>(pActInfo->second.second.getToken(PoEntry::DUMMY,'\t').
copy(nDummyBit++,1).toBoolean()));
aNewPo.writeEntry(aPE);
}
@@ -173,28 +197,13 @@ void HandleLanguage(struct dirent* pLangEntry, const OString& rPath,
{
cerr
<< "Invalid sdf line "
- << sActUnTrans.replaceAll("\t","\\t").getStr() << '\n';
+ << pActInfo->second.first.replaceAll("\t","\\t").getStr() << '\n';
}
}
}
- //Check wheather next entry is in the same po file
- OString sNextSourcePath = aSDFInput.eof() ? "" :
- GetPath(sPath,sLine = OString(s.data(),s.length()));
- if (sNextSourcePath!=sActSourcePath)
- {
- aNewPo.close();
- system(("rm " + sActSourcePath +".po").getStr());
- system(("mv "+ sActSourcePath +".po_tmp " +
- sActSourcePath +".po").getStr());
- }
- }
-
- //Close and remove sdf file
- aSDFInput.close();
- if (osl::File::remove(aTempUrl) != osl::FileBase::E_None)
- {
- cerr << "Warning: failure removing temporary " << aTempUrl << '\n';
}
+ aNewPo.close();
+ aPoInfos.clear();
}
@@ -203,10 +212,7 @@ int main(int argc, char* argv[])
//Usage
if (argc < 4)
{
- cout << "Use: renewpot translationsdir po2lo en-US.sdf" << endl;
- cout << "translationsdir: this directory contains the po" << endl;
- cout << "files of all languages. Every language has a" << endl;
- cout << "directory named with language id." << endl;
+ cout << "Use: renewpot oldpots newpots po2lo en-US.sdf" << endl;
return 1;
}
@@ -216,7 +222,8 @@ int main(int argc, char* argv[])
{
if ( OString(pActEntry->d_name).indexOf('.')==-1 )
HandleLanguage(pActEntry,OString(argv[1]),
- OString(argv[2]),OString(argv[3]));
+ OString(argv[2]),OString(argv[3]),
+ OString(argv[4]));
}
closedir(pTranslations);
}
generated by cgit (git 2.34.1) at 2025-02-15 12:32:37 +0000