diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /deployment/common/templates | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'deployment/common/templates')
| -rw-r--r-- | deployment/common/templates/i18n | 28 | ||||
| -rw-r--r-- | deployment/common/templates/locale.conf | 28 |
2 files changed, 28 insertions, 28 deletions
diff --git a/deployment/common/templates/i18n b/deployment/common/templates/i18n index a96665e7..b85efe78 100644 --- a/deployment/common/templates/i18n +++ b/deployment/common/templates/i18n @@ -3,18 +3,18 @@ locale = 'en_US.UTF-8' -%> -LC_TELEPHONE=<%= @locale %> -LC_CTYPE=<%= @locale %> -LANGUAGE=<%= @locale %>:<%= (@locale).split('.')[0] %>:<%= (@locale).split('.')[0].split('_')[0] %> -LC_MONETARY=<%= @locale %> -LC_ADDRESS=<%= @locale %> -LC_COLLATE=<%= @locale %> -LC_PAPER=<%= @locale %> -LC_NAME=<%= @locale %> -LC_NUMERIC=<%= @locale %> +LC_TELEPHONE=<%= locale %> +LC_CTYPE=<%= locale %> +LANGUAGE=<%= locale %>:<%= locale.split('.')[0] %>:<%= locale.split('.')[0].split('_')[0] %> +LC_MONETARY=<%= locale %> +LC_ADDRESS=<%= locale %> +LC_COLLATE=<%= locale %> +LC_PAPER=<%= locale %> +LC_NAME=<%= locale %> +LC_NUMERIC=<%= locale %> SYSFONT=lat0-16 -LC_MEASUREMENT=<%= @locale %> -LC_TIME=<%= @locale %> -LANG=<%= @locale %> -LC_IDENTIFICATION=<%= @locale %> -LC_MESSAGES=<%= @locale %> +LC_MEASUREMENT=<%= locale %> +LC_TIME=<%= locale %> +LANG=<%= locale %> +LC_IDENTIFICATION=<%= locale %> +LC_MESSAGES=<%= locale %> diff --git a/deployment/common/templates/locale.conf b/deployment/common/templates/locale.conf index 37520558..e9fc2e06 100644 --- a/deployment/common/templates/locale.conf +++ b/deployment/common/templates/locale.conf @@ -3,18 +3,18 @@ locale = 'en_US.UTF-8' -%> -LC_TELEPHONE=<%= @locale %> -LC_CTYPE=<%= @locale %> -LANGUAGE=<%= @locale %>:<%= @locale.split('.')[0] %>:<%= @locale.split('.')[0].split('_')[0] %> -LC_MONETARY=<%= @locale %> -LC_ADDRESS=<%= @locale %> -LC_COLLATE=<%= @locale %> -LC_PAPER=<%= @locale %> -LC_NAME=<%= @locale %> -LC_NUMERIC=<%= @locale %> -LC_MEASUREMENT=<%= @locale %> -LC_TIME=<%= @locale %> -LANG=<%= @locale %> -LC_IDENTIFICATION=<%= @locale %> -LC_MESSAGES=<%= @locale %> +LC_TELEPHONE=<%= locale %> +LC_CTYPE=<%= locale %> +LANGUAGE=<%= locale %>:<%= locale.split('.')[0] %>:<%= locale.split('.')[0].split('_')[0] %> +LC_MONETARY=<%= locale %> +LC_ADDRESS=<%= locale %> +LC_COLLATE=<%= locale %> +LC_PAPER=<%= locale %> +LC_NAME=<%= locale %> +LC_NUMERIC=<%= locale %> +LC_MEASUREMENT=<%= locale %> +LC_TIME=<%= locale %> +LANG=<%= locale %> +LC_IDENTIFICATION=<%= locale %> +LC_MESSAGES=<%= locale %> |