From 2c7da66570999dcd21f11f976dc6ec27d820f45c Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 4 Oct 2024 19:28:06 -0700 Subject: Use @ when accessing variables in templates Access without the @ symbol is the older method and is discouraged. --- deployment/common/templates/i18n | 28 ++++++++++++++-------------- deployment/common/templates/locale.conf | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'deployment/common') diff --git a/deployment/common/templates/i18n b/deployment/common/templates/i18n index b85efe78..630be077 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 e9fc2e06..37520558 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 %> -- cgit v1.2.1