From ef72f2246a43ee5ed1c23a10192b547d3a32b128 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 23 Jan 2020 16:52:25 +0100
Subject: [PATCH 1/2] Import Indonesian resource check from TravisCI to Weblate
 pipeline

---
 .buildkite/pipeline.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index de434d0122..a410ea0af9 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -86,3 +86,10 @@ steps:
     plugins:
       - docker#v3.1.0:
           image: "openjdk"
+
+  # Check that indonesians files are identical.
+  # Due to Android issue, the resource folder must be values-in/, and Weblate export data into values-id/.
+  # If this step fails, it means that Weblate has updated the file in value-id/ so to fix it, copy the file to values-in/
+  - label: "Indonesian"
+    command:
+      - "diff ./vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-in/strings.xml"

From 7d00aabc858051d984ef99cdada31e70677f8c1d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 23 Jan 2020 17:06:29 +0100
Subject: [PATCH 2/2] Share the same Copyright header. Disabled for XML files

---
 .gitignore                            | 4 ----
 .idea/copyright/NewVector.xml         | 6 ++++++
 .idea/copyright/profiles_settings.xml | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 .idea/copyright/NewVector.xml
 create mode 100644 .idea/copyright/profiles_settings.xml

diff --git a/.gitignore b/.gitignore
index 9f442cce2b..eebd8a3a5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,3 @@
 /tmp
 
 ktlint
-.idea/copyright/New_vector.xml
-.idea/copyright/profiles_settings.xml
-
-.idea/copyright/New_Vector_Ltd.xml
diff --git a/.idea/copyright/NewVector.xml b/.idea/copyright/NewVector.xml
new file mode 100644
index 0000000000..72a4f2e779
--- /dev/null
+++ b/.idea/copyright/NewVector.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright (c) &amp;#36;today.year New Vector Ltd&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="myName" value="NewVector" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000000..0a43e30a6b
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,8 @@
+<component name="CopyrightManager">
+  <settings default="NewVector">
+    <LanguageOptions name="XML">
+      <option name="fileTypeOverride" value="1" />
+      <option name="prefixLines" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
\ No newline at end of file