[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - configure.ac instsetoo_native/util l10ntools/source postprocess/packregistry solenv/bin solenv/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 14 03:13:55 PST 2012
configure.ac | 11 ++++++++---
instsetoo_native/util/makefile.mk | 4 ++--
l10ntools/source/lngmerge.cxx | 6 +++++-
l10ntools/source/po.cxx | 17 +++++++++--------
postprocess/packregistry/makefile.mk | 1 +
solenv/bin/ooinstall | 15 ++-------------
solenv/inc/postset.mk | 2 +-
7 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 49b9318873151d25478095bd66ef1cd40c86ba67
Author: Andras Timar <atimar at suse.com>
Date: Wed Dec 12 10:07:35 2012 +0100
Make KeyID (qtz) work again
Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
diff --git a/configure.ac b/configure.ac
index 5d48f02..b241dea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11565,7 +11565,11 @@ AC_MSG_CHECKING([which languages to be built])
# + removes en-US; we want to put it on the beginning
# + prints just the section starting with 'completelangiso=' and ending with the " at the end of line
[eval $(sed -e :a -e '/\\$/N; s/\\\n//; ta' -n -e 's/=/="/;s/\([^\\]\)$/\1"/;s/en-US//;/^completelangiso/p' solenv/inc/langlist.mk)]
-ALL_LANGS="en-US $completelangiso"
+if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
+ ALL_LANGS="en-US $completelangiso qtz"
+else
+ ALL_LANGS="en-US $completelangiso"
+fi
# check the configured localizations
WITH_LANG="$with_lang"
if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
@@ -11589,10 +11593,11 @@ for lang in $WITH_LANG; do
done
# list with substituted ALL
WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
-# this variable is used only by bin/distro-install-* helper scripts
-# they need a real list of languages
test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
test "$WITH_LANG" = "en-US" && WITH_LANG=
+if test "$enable_release_build" = "" -o "$enable_releasbie_build" = "no"; then
+ test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz`
+fi
AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 7d79e29..e4dd09f 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,9 +76,9 @@ OOOHELPPACK=ooohelppack
OOODEVHELPPACK=ooodevhelppack
.ENDIF
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
-# do not build key is pseudolanguage for release builds
+# do not build KeyID pseudolanguage (qtz) for release builds
.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
alllangiso:=$(alllangiso:s/qtz //)
.ENDIF
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 9da45b6..71f68ef 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -184,7 +184,7 @@ sal_Bool LngParser::Merge(
}
nError = LNG_OK;
- MergeDataFile aMergeDataFile( rSDFFile, sSource, false, false );
+ MergeDataFile aMergeDataFile( rSDFFile, sSource, false, true );
rtl::OString sTmp( Export::sLanguages );
if( sTmp.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("ALL")) )
Export::SetLanguages( aMergeDataFile.GetLanguages() );
@@ -260,6 +260,8 @@ sal_Bool LngParser::Merge(
{
rtl::OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sLang, sal_True );
+ if( sLang == "qtz" )
+ sNewText = sNewText.copy(6);
if ( !sNewText.isEmpty()) {
rtl::OString *pLine = (*pLines)[ nPos ];
@@ -296,6 +298,8 @@ sal_Bool LngParser::Merge(
rtl::OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur, sal_True );
+ if( sCur == "qtz" )
+ sNewText = sNewText.copy(6);
if (( !sNewText.isEmpty()) &&
!(( sCur.equalsL(RTL_CONSTASCII_STRINGPARAM("x-comment"))) && ( sNewText == "-" )))
{
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 3150607..9d84466 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -517,6 +517,7 @@ $(MISC)/lang/Langpack-{$(alllangiso)}.xcd : $(SOLARXMLDIR)/$(MY_MOD)/$$(@:b).xcu
$(MISC)/lang/Langpack-%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
+ echo '************ $(alllangiso) ***************'
- $(RM) $(MISC)/$(@:b).list
echo '<list><dependency file="main"/>' \
'<filename>$(MY_MOD)/$(@:b).xcu</filename></list>' > $(MISC)/$(@:b).list
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index a4ce6ce..3b086c6 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -91,19 +91,8 @@ $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
$ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
my @larr;
-$langs=$ENV{WITH_LANG};
-$langs='en-US' if $langs eq '';
-if ($langs eq 'ALL') {
- opendir(DIR,$ENV{L10N_MODULE} . "/source");
- @larr = readdir(DIR);
- @larr = grep { $_ ne '.' } @larr;
- @larr = grep { $_ ne '..' } @larr;
- @larr = (@larr,"en-US");
- closedir(DIR);
-}
-else {
- @larr = grep { $_ ne '' } split(/ /, $langs);
-}
+$langs=$ENV{WITH_LANG_LIST};
+ at larr = grep { $_ ne '' } split(/ /, $langs);
$langs = join (",", @larr);
$destdir='';
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index e9632dd..0762011 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -23,4 +23,4 @@ defaultlangiso=en-US
# Complete list of all supported localizations (ISO codes)
.INCLUDE : langlist.mk
-alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
+alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(WITH_LANG_LIST)))
commit c0476ad5b0aa8758603b4a2b9f6f8feed130b1b4
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Dec 13 15:32:02 2012 +0100
Fix adding keyid to po when read from file
Change-Id: I29fdd23da97f1102974a6b5821c224264a37efc3
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index c59a4f8..41167bc 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -813,14 +813,7 @@ void PoIfstream::readEntry( PoEntry& rPoEntry )
(sType == "text" || sType == "quickhelptext" || sType == "title")&&
!aGenPo.getMsgId().isEmpty() )
{
- if( rPoEntry.m_pGenPo )
- {
- *(rPoEntry.m_pGenPo) = aGenPo;
- }
- else
- {
- rPoEntry.m_pGenPo = new GenPoEntry( aGenPo );
- }
+ //Generate keyid if po file not includes it
const OString sExtractCom = aGenPo.getExtractCom();
if( sExtractCom.isEmpty() ||
( sExtractCom.getLength() != 4 &&
@@ -832,6 +825,14 @@ void PoIfstream::readEntry( PoEntry& rPoEntry )
aGenPo.getReference() + sMsgCtxt +
aGenPo.getMsgId() ) );
}
+ if( rPoEntry.m_pGenPo )
+ {
+ *(rPoEntry.m_pGenPo) = aGenPo;
+ }
+ else
+ {
+ rPoEntry.m_pGenPo = new GenPoEntry( aGenPo );
+ }
rPoEntry.m_bIsInitialized = true;
}
else
More information about the Libreoffice-commits
mailing list