Make the translations an optional argument instead of default on

In the interest of only applying i18n work when one desires it, make the
installation of translations an optional extra variable that you request
when running the playbook.

Signed-off-by: Ben Shum <ben@evergreener.net>

diff --git a/README.adoc b/README.adoc
index f01e9c6..72b3df4 100644 (file)
--- a/README.adoc
+++ b/README.adoc
@@ -18,6 +18,9 @@ sudo ansible-playbook playbook.yml
 # Alternate example demonstrating variable overrides by installing a 
 # specific OpenSRF branch.
 # sudo ansible-playbook playbook.yml --extra-vars "osrf_git_branch=rel_2_5"
+
+# Install with the sample locales defined in translations.yml
+# sudo ansible-playbook playbook.yml --extra-vars "translations=true"
 ---------------------------------------------------------------------------
 
 3. In Chrome/FF navigate to https://<HOSTNAME>/eg/staff/ and click 

diff --git a/evergreen/apache.yml b/evergreen/apache.yml
index 18b975b..771872a 100644 (file)
--- a/evergreen/apache.yml
+++ b/evergreen/apache.yml
@@ -9,9 +9,10 @@
   copy:
     src: "{{repo_base}}/Evergreen/Open-ILS/examples/apache_24/eg_vhost_24.conf"
     dest: /etc/apache2/eg_vhost.conf 
-- name: Setup "{{ locale }}" for TPAC
+- name: Setup locale(s) for TPAC
   vars:
     eg_locale: "{{ item | lower | regex_replace('(\\w{2})-(\\w{2})', '\\1_\\2') }}"
+  when: locale is defined
   blockinfile:
     dest: /etc/apache2/eg_vhost.conf
     insertafter: '    #PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/fr-CA.po"'
@@ -19,11 +20,12 @@
     block: |
       PerlAddVar OILSWebLocale "{{ eg_locale }}"
       PerlAddVar OILSWebLocale "/openils/var/data/locale/opac/{{ item }}.po"
-  with_items: "{{ locale }}"
-  when: locale is defined
-- name: Setup "{{ locale }}" for web staff client
+    with_items: "{{ locale }}"
+    when: locale is defined
+- name: Setup locale(s) for web staff client
   vars:
     staff_eg_locale: "{{ item | lower | regex_replace('(\\w{2})-(\\w{2})', '\\1_\\2') }}"
+  when: locale is defined
   blockinfile:
     dest: /etc/apache2/eg_vhost.conf
     insertafter: '    #PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/fr-CA.po"'
@@ -31,8 +33,8 @@
     block: |
       PerlAddVar OILSWebLocale "{{ staff_eg_locale }}"
       PerlAddVar OILSWebLocale "/openils/var/data/locale/staff/{{ item }}.po"
-  with_items: "{{ locale }}"
-  when: locale is defined
+    with_items: "{{ locale }}"
+    when: locale is defined
 - name: Setup eg_startup
   copy:
     src: "{{repo_base}}/Evergreen/Open-ILS/examples/apache/eg_startup"

diff --git a/evergreen/main.yml b/evergreen/main.yml
index 327dd9d..810537a 100644 (file)
--- a/evergreen/main.yml
+++ b/evergreen/main.yml
@@ -1,3 +1,6 @@
+- name: Check for translations
+  include_vars: translations.yml
+  when: translations is defined
 - name: Build Evergreen
   include: eg-build.yml
 - name: Build Evergreen Web

diff --git a/settings.yml b/settings.yml
index f1565bd..74e74f3 100644 (file)
--- a/settings.yml
+++ b/settings.yml
@@ -52,10 +52,3 @@ load_sample_data: --load-all-sample
 # Requires create_schema:true
 install_pgtap: true
 # --------------------------------------------------------------------------
-
-# optional: set some example locales
-locale:
-    - ar-JO
-    - cs-CZ
-    - es-ES
-    - fr-CA

diff --git a/translations.yml b/translations.yml
new file mode 100644 (file)
index 0000000..d4716bd
--- /dev/null
+++ b/translations.yml
@@ -0,0 +1,8 @@
+# The following locales are examples
+# Edit accordingly to match requirements
+locale:
+    - ar-JO
+    - cs-CZ
+    - es-ES
+    - fr-CA
+