Make KeyID (qtz) work again

Conflicts:
	configure.ac

Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058

configure.ac

@@ -11829,7 +11829,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' $SRC_ROOT/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
@@ -11853,10 +11857,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)

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

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 == "-" )))
                     {

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

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};
+@larr = grep { $_ ne '' } split(/ /, $langs);
 $langs = join (",", @larr);
 
 $destdir='';

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)))