diff --git a/tools/fix_all_strings.sh b/tools/fix_all_strings.sh deleted file mode 100755 index 47d837735..000000000 --- a/tools/fix_all_strings.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -SCRIPT=$(readlink -f $0) -SCRIPTPATH=`dirname $SCRIPT` -PROJECTROOT=`dirname $SCRIPTPATH` - -cd $PROJECTROOT - -find res/values* -name "strings.xml" -type f ! -wholename "res/values-fr-rCA/strings.xml" -exec ./tools/fix_strings.py {} \; - -cd - diff --git a/tools/fix_strings.py b/tools/fix_strings.py deleted file mode 100755 index ff2ce52a2..000000000 --- a/tools/fix_strings.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env python -# Rewrite a strings file to get rid of line break/whitespace combinations that get stripped when building with Gradle. -# -# Example: -# -# Account \"%s\" shrunk from -# %s -# to -# %s -# -# -# will be rendered as -# -# Account "account" shrunk from10MB to1MB -# -# when built with Gradle, but displays fine when built with Ant. -# -# -# Written for use with K-9 Mail (https://github.com/k9mail/k-9) -# Licensed under the WTFPL (http://www.wtfpl.net/about/) - -import sys -import re -from lxml import etree - - -def fix_text(element): - if element.text is not None: - element.text = re.sub(r'^\n\s*([^\s])', "\\1", element.text) - element.text = re.sub(r'\n\s*$', " ", element.text) - - -def fix_tail(element, is_last): - if element.tail is not None: - if is_last: - replacement = "" - else: - replacement = " " - element.tail = re.sub(r'^\n\s*([^\s])', " \\1", element.tail) - element.tail = re.sub(r'\n\s*$', replacement, element.tail) - - -def cleanup_string_elements(elements): - for element in elements: - if element.tag is None: - continue - - tag = element.tag - children = element.getchildren() - - if tag in ["string", "item"]: - if len(children) > 0: - fix_text(element) - - for child in children: - if isinstance(child.tag, basestring): - fix_text(child) - fix_tail(child, child == children[-1]) - - elif tag == "plurals": - cleanup_string_elements(children) - - -if len(sys.argv) < 2: - print "Usage: fix_strings.py " - print "Example: fix_strings.py res/values/strings.xml" - exit(1) - -strings_file = sys.argv[1] - -parser = etree.XMLParser(strip_cdata=False) -strings = etree.parse(strings_file, parser=parser) - -cleanup_string_elements(strings.getroot().getchildren()) - -strings.write(strings_file, xml_declaration=True, encoding="UTF-8", pretty_print=True)