From 95f63da423e78270e2beefae2b27bec558375a6b Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 18 Mar 2018 18:42:08 +0000
Subject: [PATCH] =?UTF-8?q?locali(s|z)ation=20=E2=86=92=20l10n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packer/ansible/playbook.yml                                 | 6 +++---
 .../ansible/roles/{localisation => l10n}/handlers/main.yml  | 0
 .../{localisation => l10n}/tasks/keyboard-configuration.yml | 0
 .../ansible/roles/{localisation => l10n}/tasks/locale.yml   | 2 +-
 packer/ansible/roles/{localisation => l10n}/tasks/main.yml  | 0
 packer/ansible/roles/l10n/templates/keyboard.j2             | 6 ++++++
 packer/ansible/roles/l10n/templates/locale.gen.j2           | 3 +++
 packer/ansible/roles/localisation/templates/keyboard.j2     | 6 ------
 packer/ansible/roles/localisation/templates/locale.gen.j2   | 3 ---
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename packer/ansible/roles/{localisation => l10n}/handlers/main.yml (100%)
 rename packer/ansible/roles/{localisation => l10n}/tasks/keyboard-configuration.yml (100%)
 rename packer/ansible/roles/{localisation => l10n}/tasks/locale.yml (85%)
 rename packer/ansible/roles/{localisation => l10n}/tasks/main.yml (100%)
 create mode 100644 packer/ansible/roles/l10n/templates/keyboard.j2
 create mode 100644 packer/ansible/roles/l10n/templates/locale.gen.j2
 delete mode 100644 packer/ansible/roles/localisation/templates/keyboard.j2
 delete mode 100644 packer/ansible/roles/localisation/templates/locale.gen.j2

diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml
index 5e1e4cc..1a18155 100644
--- a/packer/ansible/playbook.yml
+++ b/packer/ansible/playbook.yml
@@ -20,9 +20,9 @@
     - role: windowmanager
       tags:
         - windowmanager
-    - role: localisation
+    - role: l10n
       tags:
-        - localisation
+        - l10n
     - role: inkscape
       tags:
         - inkscape
@@ -34,7 +34,7 @@
       sudo:
         group: fablab
 
-    localisation:
+    l10n:
       keyboard:
         layout: de
         variant:
diff --git a/packer/ansible/roles/localisation/handlers/main.yml b/packer/ansible/roles/l10n/handlers/main.yml
similarity index 100%
rename from packer/ansible/roles/localisation/handlers/main.yml
rename to packer/ansible/roles/l10n/handlers/main.yml
diff --git a/packer/ansible/roles/localisation/tasks/keyboard-configuration.yml b/packer/ansible/roles/l10n/tasks/keyboard-configuration.yml
similarity index 100%
rename from packer/ansible/roles/localisation/tasks/keyboard-configuration.yml
rename to packer/ansible/roles/l10n/tasks/keyboard-configuration.yml
diff --git a/packer/ansible/roles/localisation/tasks/locale.yml b/packer/ansible/roles/l10n/tasks/locale.yml
similarity index 85%
rename from packer/ansible/roles/localisation/tasks/locale.yml
rename to packer/ansible/roles/l10n/tasks/locale.yml
index 38d1e44..0ded02f 100644
--- a/packer/ansible/roles/localisation/tasks/locale.yml
+++ b/packer/ansible/roles/l10n/tasks/locale.yml
@@ -14,4 +14,4 @@
   lineinfile:
     path: /etc/default/locale
     regexp: "^LANG="
-    line: "LANG={{ localisation.locale.default }}"
+    line: "LANG={{ l10n.locale.default }}"
diff --git a/packer/ansible/roles/localisation/tasks/main.yml b/packer/ansible/roles/l10n/tasks/main.yml
similarity index 100%
rename from packer/ansible/roles/localisation/tasks/main.yml
rename to packer/ansible/roles/l10n/tasks/main.yml
diff --git a/packer/ansible/roles/l10n/templates/keyboard.j2 b/packer/ansible/roles/l10n/templates/keyboard.j2
new file mode 100644
index 0000000..8365e49
--- /dev/null
+++ b/packer/ansible/roles/l10n/templates/keyboard.j2
@@ -0,0 +1,6 @@
+XKBMODEL="{{ l10n.keyboard.model }}"
+XKBLAYOUT="{{ l10n.keyboard.layout }}"
+XKBVARIANT="{{ l10n.keyboard.variant }}"
+XKBOPTIONS="{{ l10n.keyboard.options }}"
+
+BACKSPACE="guess"
diff --git a/packer/ansible/roles/l10n/templates/locale.gen.j2 b/packer/ansible/roles/l10n/templates/locale.gen.j2
new file mode 100644
index 0000000..1c39bf7
--- /dev/null
+++ b/packer/ansible/roles/l10n/templates/locale.gen.j2
@@ -0,0 +1,3 @@
+{% for locale in l10n.locale.generate %}
+{{ locale }}
+{% endfor %}
diff --git a/packer/ansible/roles/localisation/templates/keyboard.j2 b/packer/ansible/roles/localisation/templates/keyboard.j2
deleted file mode 100644
index ed1f65b..0000000
--- a/packer/ansible/roles/localisation/templates/keyboard.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-XKBMODEL="{{ localisation.keyboard.model }}"
-XKBLAYOUT="{{ localisation.keyboard.layout }}"
-XKBVARIANT="{{ localisation.keyboard.variant }}"
-XKBOPTIONS="{{ localisation.keyboard.options }}"
-
-BACKSPACE="guess"
diff --git a/packer/ansible/roles/localisation/templates/locale.gen.j2 b/packer/ansible/roles/localisation/templates/locale.gen.j2
deleted file mode 100644
index ae07994..0000000
--- a/packer/ansible/roles/localisation/templates/locale.gen.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for locale in localisation.locale.generate %}
-{{ locale }}
-{% endfor %}