diff options
| author | Andras Timar <atimar@suse.com> | 2011-10-29 00:14:55 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-10-29 00:21:20 +0200 |
| commit | df6c97530ed394d60504523f55d7a21469a73625 (patch) | |
| tree | 9fdfcf2cff6eb4923f21c4c1c9ed40a915ef6652 /l10ntools | |
| parent | adb8868edaebb372a54140f84bf85ac9eef37918 (diff) | |
tweak handling of extension descriptions
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/source/xrmmerge.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index b158b3544055..9591c552125a 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -685,9 +685,8 @@ void XRMResMerge::WorkOnDesc( sSearch = ByteString("xlink:href=\""); sReplace = sSearch; - ByteString sLocDescFilename = sCur; - sLocDescFilename += ByteString("-"); - sLocDescFilename += sDescFilename; + ByteString sLocDescFilename = sDescFilename; + sLocDescFilename.SearchAndReplace( "en-US", sCur ); sSearch += sDescFilename; sReplace += sLocDescFilename; @@ -697,8 +696,9 @@ void XRMResMerge::WorkOnDesc( DirEntry aEntry( String( sOutputFile, RTL_TEXTENCODING_ASCII_US )); aEntry.ToAbs(); - ByteString sOutputDescFile( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - sOutputDescFile.SearchAndReplaceAll( "description.xml", "" ); + ByteString sOutputDescFile( aEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US ); + ByteString sDel( DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US ); + sOutputDescFile += sDel; sOutputDescFile += sLocDescFilename; sText.SearchAndReplaceAll( "\\n", "\n" ); ofstream file ( sOutputDescFile.GetBuffer() ); |