Commit 4b32c038 authored by Victor Nikulshin's avatar Victor Nikulshin

Merge branch 'bug/use-prompted-var-to-install-site-with-a-specified-language' into '2.x'

Provide a new var, to define site default language



See merge request !35
parents ac9adcbd 0d91a9bb
Pipeline #1697 failed with stages
......@@ -88,7 +88,10 @@ Those are global project parameters mandatory to Drupalizer.
|The Drupal site directory (only for multisite). Default: _default_.
|_site_languages_
|Translation files that must be downloaded when building Drupal and activated during installation (separate with comma). Default: _fr_.
|Translation files that must be downloaded when building Drupal and activated during installation (separate with comma). Default: _''_.
|_site_default_language_
|The default language for site installation. Default: _''_.
|===
......
......@@ -27,7 +27,7 @@ env.site_admin_user = 'admin'
env.site_admin_pass = 'admin'
env.site_subdir = 'default'
env.site_languages = ''
env.site_default_language = ''
# PatternLab
......
......@@ -127,8 +127,8 @@ def site_install():
h.fab_run(role, 'chown {}:{} ./sites'.format(env.apache_user, env.apache_user))
h.fab_run(role, 'chmod ug+w ./sites/default'.format(env.docker_site_root))
if env.site_languages:
locale = '--locale="{}"'.format(env.site_languages.split(',')[0])
if env.site_default_language:
locale = '--locale="{}"'.format(env.site_default_language)
else:
locale = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment