Skip to content

C
core
Kaydet (Commit) 4c530d3d authored tarafından Andras Timar's avatar Andras Timar
Dosyalara gözat
Seçenekler

good-bye stringex, you served well 

It will be better to handle Android Impress Remote localization
independent of the big LibreOffice source tree. Instead of
stringex, we will use android2po, a 3rd party utility for conversion
strings.xml <-> pot/po.

Change-Id: I4eae53e4f8d94c55e5564d54c5e5c214bc9569d7
üst 5b328e8f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 357 deletions
Repository.mk
Dosyayı görüntüle @ 4c530d3d
......@@ -54,7 +54,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
sp2bv \
svg2odf \
svidl \
stringex \
transex3 \
treex \
uiex \
......
android/sdremote/Makefile
Dosyayı görüntüle @ 4c530d3d
......@@ -10,11 +10,7 @@ ifeq ($(BUILDDIR),)
include ../../config_host.mk
endif
STRINGEX_EXECUTABLE := $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/stringex
STRINGEX_LDPATH := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)
STRINGEX_COMMAND := $(STRINGEX_LDPATH) $(STRINGEX_EXECUTABLE)
all: properties translations.done
all: properties
mkdir -p ../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../abs-lib/libs
$(ANT) debug
......@@ -23,44 +19,10 @@ properties:
echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
echo sdk.dir=$(ANDROID_SDK_HOME) >../abs-lib/local.properties
clean: properties translations.clean
clean: properties
$(ANT) -quiet -keep-going clean
install: all
$(ANDROID_SDK_HOME)/platform-tools/adb install -r ./bin/ImpressRemote-debug.apk
define android_get_podir
res/values-$(1)
endef
define android_get_po
$(call android_get_podir,$(1))/strings.xml
endef
define android_translation_rules
$(call android_get_po,$(1)):
mkdir -p res/values-$(1)
echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po > translations-$(1).db &&\
$(STRINGEX_COMMAND) -i res/values/strings.xml -o res/values-$(1)/strings.xml -m translations-$(1).db -l $(1)
endef
define android_translations_rules
$(foreach lang,$(1),$(call android_translation_rules,$(lang)))
endef
define android_get_langlist
$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso kok qtz,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
endef
$(eval $(call android_translations_rules,$(call android_get_langlist)))
translations.done: $(foreach lang,$(call android_get_langlist),$(call android_get_po,$(lang)))
touch translations.done
translations.clean:
rm -rf $(foreach lang,$(call android_get_langlist),$(call android_get_podir,$(lang)))
rm -rf $(foreach lang,$(call android_get_langlist),translations-$(lang).db)
rm -f translations.done
# vim: set noet sw=4 ts=4:
l10ntools/Executable_stringex.mk deleted 100644 → 0
Dosyayı görüntüle @ 5b328e8f
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Executable_Executable,stringex))
$(eval $(call gb_Executable_set_include,stringex,\
-I$(SRCDIR)/l10ntools/inc \
$$(INCLUDE) \
))
$(eval $(call gb_Executable_use_libraries,stringex,\
sal \
))
$(eval $(call gb_Executable_use_static_libraries,stringex,\
transex \
))
$(eval $(call gb_Executable_add_exception_objects,stringex,\
l10ntools/source/stringmerge \
l10ntools/source/stringex \
))
$(eval $(call gb_Executable_use_externals,stringex,\
boost_headers \
libxml2 \
))
# vim: set noet sw=4 ts=4:
l10ntools/Module_l10ntools.mk
Dosyayı görüntüle @ 4c530d3d
......@@ -21,7 +21,6 @@ $(eval $(call gb_Module_add_targets_for_build,l10ntools,\
Executable_pocheck \
Executable_propex \
Executable_treex \
Executable_stringex \
StaticLibrary_transex \
))
......
l10ntools/inc/stringmerge.hxx deleted 100644 → 0
Dosyayı görüntüle @ 5b328e8f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_L10NTOOLS_INC_STRINGMERGE_HXX
#define INCLUDED_L10NTOOLS_INC_STRINGMERGE_HXX
#include <libxml/tree.h>
#include <rtl/string.hxx>
#include <vector>
/** Class for Android strings.xml localization
Parse strings.xml files, extract translatable strings
and merge translated strings.
*/
class StringParser
{
private:
xmlDocPtr m_pSource;
OString m_sLang;
bool m_bIsInitialized;
public:
StringParser(
const OString& rInputFile, const OString& rLang );
~StringParser();
bool isInitialized() const { return m_bIsInitialized; }
void Extract( const OString& rPOFile );
void Merge(
const OString &rMergeSrc, const OString &rDestinationFile );
};
#endif // INCLUDED_L10NTOOLS_INC_STRINGMERGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
l10ntools/source/localize.cxx
Dosyayı görüntüle @ 4c530d3d
......@@ -186,7 +186,6 @@ bool handleFile(
{ RTL_CONSTASCII_STRINGPARAM(".xcu"), "cfgex", false },
{ RTL_CONSTASCII_STRINGPARAM(".xrm"), "xrmex", false },
{ RTL_CONSTASCII_STRINGPARAM("description.xml"), "xrmex", true },
{ RTL_CONSTASCII_STRINGPARAM("strings.xml"), "stringex", true },
{ RTL_CONSTASCII_STRINGPARAM(".xhp"), "helpex", false },
{ RTL_CONSTASCII_STRINGPARAM(".properties"), "propex", false },
{ RTL_CONSTASCII_STRINGPARAM(".ui"), "uiex", false },
......@@ -270,7 +269,6 @@ void handleFilesOfDir(
bool includeProject(const OString& rProject) {
static const OString projects[] = {
"accessibility",
"android",
"avmedia",
"basctl",
"basic",
......
l10ntools/source/stringex.cxx deleted 100644 → 0
Dosyayı görüntüle @ 5b328e8f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <iostream>
#include "sal/main.h"
#include "common.hxx"
#include "stringmerge.hxx"
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
common::HandledArgs aArgs;
if( !common::handleArguments(argc, argv, aArgs) )
{
common::writeUsage("stringex","string.xml");
return 1;
}
StringParser aParser(aArgs.m_sInputFile, aArgs.m_sLanguage);
if( !aParser.isInitialized() )
{
return 1;
}
if( aArgs.m_bMergeMode )
{
aParser.Merge( aArgs.m_sMergeSrc, aArgs.m_sOutputFile );
}
else
{
aParser.Extract( aArgs.m_sOutputFile );
}
return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
l10ntools/source/stringmerge.cxx deleted 100644 → 0
Dosyayı görüntüle @ 5b328e8f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <iostream>
#include <fstream>
#include <cassert>
#include <cstring>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <libxml/xmlstring.h>
#include "export.hxx"
#include "helper.hxx"
#include "common.hxx"
#include "po.hxx"
#include "stringmerge.hxx"
//Parse strings.xml file
StringParser::StringParser(
const OString& rInputFile, const OString& rLang )
: m_pSource( 0 )
, m_sLang( rLang )
, m_bIsInitialized( false )
{
m_pSource = xmlParseFile( rInputFile.getStr() );
if ( !m_pSource ) {
std::cerr
<< "Stringx error: Cannot open source file: "
<< rInputFile.getStr() << std::endl;
return;
}
if( !m_pSource->name )
{
m_pSource->name = new char[strlen(rInputFile.getStr())+1];
strcpy( m_pSource->name, rInputFile.getStr() );
}
m_bIsInitialized = true;
}
StringParser::~StringParser()
{
}
//Extract strings form source file
void StringParser::Extract( const OString& rPOFile )
{
assert( m_bIsInitialized );
PoOfstream aPOStream( rPOFile, PoOfstream::APP );
if( !aPOStream.isOpen() )
{
std::cerr
<< "stringex error: Cannot open po file for extract: "
<< rPOFile.getStr() << std::endl;
return;
}
xmlNodePtr pRootNode = xmlDocGetRootElement( m_pSource ); // <resource>
for( xmlNodePtr pCurrent = pRootNode->children->next;
pCurrent; pCurrent = pCurrent->next)
{
if (!xmlStrcmp(pCurrent->name, (const xmlChar*)("string")))
{
xmlChar* pTranslatable = xmlGetProp(pCurrent, (const xmlChar*)("translatable"));
if (xmlStrcmp(pTranslatable, (const xmlChar*)("false")))
{
xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("name"));
xmlChar* pText = xmlNodeGetContent(pCurrent);
const OString sTemp =
helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
common::writePoEntry(
"Stringex", aPOStream, m_pSource->name, "string",
helper::xmlStrToOString( pID ), OString(), OString(),
sTemp);
xmlFree( pID );
xmlFree( pText );
}
xmlFree( pTranslatable );
}
}
xmlFreeDoc( m_pSource );
xmlCleanupParser();
aPOStream.close();
m_bIsInitialized = false;
}
//Merge strings to localized strings.xml file
void StringParser::Merge(
const OString &rMergeSrc, const OString &rDestinationFile )
{
assert( m_bIsInitialized );
MergeDataFile* pMergeDataFile = 0;
if( m_sLang != "qtz" )
{
pMergeDataFile = new MergeDataFile(
rMergeSrc, static_cast<OString>( m_pSource->name ), false, false );
const std::vector<OString> vLanguages = pMergeDataFile->GetLanguages();
if( vLanguages.size()>=1 && vLanguages[0] != m_sLang )
{
std::cerr
<< "stringex error: given language conflicts with "
<< "language of Mergedata file: "
<< m_sLang.getStr() << " - "
<< vLanguages[0].getStr() << std::endl;
delete pMergeDataFile;
return;
}
}
xmlNodePtr pRootNode = xmlDocGetRootElement( m_pSource ); //<resource>
for( xmlNodePtr pCurrent = pRootNode->children;
pCurrent; pCurrent = pCurrent->next)
{
if (!xmlStrcmp(pCurrent->name, (const xmlChar*)("string")))
{
xmlChar* pID = xmlGetProp(pCurrent, (const xmlChar*)("name"));
ResData aResData(
helper::xmlStrToOString( pID ),
static_cast<OString>(m_pSource->name) );
xmlFree( pID );
aResData.sResTyp = "string";
OString sNewText;
if( m_sLang == "qtz" )
{
xmlChar* pText = xmlNodeGetContent(pCurrent);
const OString sOriginText =
helper::unEscapeAll(helper::xmlStrToOString( pText ),"\\n""\\t""\\\"""\\\'","\n""\t""\"""\'");
xmlFree( pText );
sNewText = MergeEntrys::GetQTZText(aResData, sOriginText);
}
else if( pMergeDataFile )
{
MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys( &aResData );
if( pEntrys )
{
pEntrys->GetText( sNewText, STRING_TYP_TEXT, m_sLang );
sNewText = helper::escapeAll(sNewText, "\n""\t""\'""\"","\\n""\\t""\\\'""\\\"");
}
}
if( !sNewText.isEmpty() )
{
xmlNodeSetContent(
pCurrent,
xmlEncodeSpecialChars( NULL,
reinterpret_cast<const xmlChar*>(
sNewText.getStr() )));
}
}
}
for( xmlNodePtr pCurrent = pRootNode->children; pCurrent; )
{
if (!xmlStrcmp(pCurrent->name, (const xmlChar*)("string")))
{
xmlChar* pTranslatable = xmlGetProp(pCurrent, (const xmlChar*)("translatable"));
if (!xmlStrcmp(pTranslatable, (const xmlChar*)("false")))
{
xmlNodePtr pNonTranslatable = pCurrent;
pCurrent = pCurrent->next;
xmlUnlinkNode( pNonTranslatable );
xmlFreeNode( pNonTranslatable );
}
else
{
pCurrent = pCurrent->next;
}
xmlFree( pTranslatable );
}
else
{
pCurrent = pCurrent->next;
}
}
delete pMergeDataFile;
xmlSaveFile( rDestinationFile.getStr(), m_pSource );
xmlFreeDoc( m_pSource );
xmlCleanupParser();
m_bIsInitialized = false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
solenv/gbuild/extensions/pre_BuildTools.mk
Dosyayı görüntüle @ 4c530d3d
......@@ -25,7 +25,6 @@ gb_BUILD_TOOLS = \
propex \
rsc \
saxparser \
stringex \
svidl \
transex3 \
treex \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment