From 38403338da1ee858fb9fd53b206500c8cd7bce0b Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 10 May 2017 11:47:38 +0200
Subject: [PATCH] remove xmlns tools:ignore from translations

XML namespaces are a massive pain to deal with in, and they are totally
unneeded in the translation files.  xmlns:tools is only needed in the
source file to ignore some lint warnings.
---
 app/src/main/res/values-kn/strings.xml        | 10 +++++-----
 tools/remove-unused-and-blank-translations.py | 10 ++++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index ea8e0a014..cb719008f 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools"><string name="app_name">ಎಫ್-ಡ್ರಾಯ್ಡ್</string>
+<resources><string name="app_name">ಎಫ್-ಡ್ರಾಯ್ಡ್</string>
 
     <string name="version">ಆವೃತ್ತಿ</string>
     <string name="notification_action_install">ಅನುಸ್ಥಾಪಿಸು</string>
@@ -31,10 +31,10 @@
     <string name="nearby_splash__find_people_button">ನನ್ನ ಹತ್ತಿರವಿರುವ ಜನರನ್ನು ಹುಡುಕು</string>
     <string name="system_install_installing">ಅನುಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ…</string>
     <string name="system_install_button_install">ಅನುಸ್ಥಾಪಿಸು</string>
-    <string tools:ignore="UnusedResources" name="category_Time">ಸಮಯ</string>
-    <string tools:ignore="UnusedResources" name="category_Security">ಸುರಕ್ಷತೆ</string>
-    <string tools:ignore="UnusedResources" name="category_Sports_Health">ಕ್ರೀಡೆ &amp; ಆರೋಗ್ಯ</string>
-    <string tools:ignore="UnusedResources" name="category_Games">ಆಟಗಳು</string>
+    <string name="category_Time">ಸಮಯ</string>
+    <string name="category_Security">ಸುರಕ್ಷತೆ</string>
+    <string name="category_Sports_Health">ಕ್ರೀಡೆ &amp; ಆರೋಗ್ಯ</string>
+    <string name="category_Games">ಆಟಗಳು</string>
     <string name="wifi">ವೈ-ಫೈ</string>
     <string name="pref_language">ಭಾಷೆ</string>
     <string name="repo_name">ಹೆಸರು</string>
diff --git a/tools/remove-unused-and-blank-translations.py b/tools/remove-unused-and-blank-translations.py
index 3ef71036d..811305bfa 100755
--- a/tools/remove-unused-and-blank-translations.py
+++ b/tools/remove-unused-and-blank-translations.py
@@ -26,8 +26,14 @@ for d in sorted(glob.glob(os.path.join(resdir, 'values-*'))):
     header = ''
     with open(str_path, 'r') as f:
         header = f.readline()
-    tree = ElementTree.parse(str_path)
-    root = tree.getroot()
+
+    # handling XML namespaces in Python is painful, just remove them, they
+    # should not be in the translation files anyway
+    with open(str_path, 'rb') as fp:
+        contents = fp.read()
+    contents = contents.replace(b' tools:ignore="UnusedResources"', b'') \
+                       .replace(b' xmlns:tools="http://schemas.android.com/tools"', b'')
+    root = ElementTree.fromstring(contents)
 
     for e in root.findall('.//string'):
         name = e.attrib['name']