validation: confirmation string now depends on language
This commit is contained in:
parent
d25b823f61
commit
fae808bbff
|
@ -10,6 +10,9 @@ set -eu
|
||||||
# include common functions and settings
|
# include common functions and settings
|
||||||
source $(dirname $0)/common.sh.inc
|
source $(dirname $0)/common.sh.inc
|
||||||
|
|
||||||
|
# extract confirmation text from language file
|
||||||
|
confirmtext=$(grep "\<ConfirmInit\>" "$TEMPLATE_DIR/usr/share/cryptobox/lang/${VALIDATE_LANGUAGE}.hdf" | sed 's/[^=]*=[^a-zA-Z]*\(.*\)$/\1/; s/ /%20/g; s/!/%21/g; s/,/%2C/g')
|
||||||
|
|
||||||
##################### some functions ########################
|
##################### some functions ########################
|
||||||
|
|
||||||
function do_single()
|
function do_single()
|
||||||
|
@ -92,7 +95,10 @@ function import_style()
|
||||||
|
|
||||||
function substitute_constants()
|
function substitute_constants()
|
||||||
{
|
{
|
||||||
sed "s/_HOST_IP_DEFAULT_/$VALIDATE_HOST_IP_DEFAULT/g; s/_HOST_IP_CHANGED_/$VALIDATE_HOST_IP_CHANGED/g; s/_IFACE_LANG_/$VALIDATE_LANGUAGE/g"
|
sed "s/_HOST_IP_DEFAULT_/$VALIDATE_HOST_IP_DEFAULT/g; \
|
||||||
|
s/_HOST_IP_CHANGED_/$VALIDATE_HOST_IP_CHANGED/g; \
|
||||||
|
s/_IFACE_LANG_/$VALIDATE_LANGUAGE/g;
|
||||||
|
s/_CONFIRM_TEXT_/$confirmtext/g"
|
||||||
}
|
}
|
||||||
|
|
||||||
##################### main ###########################
|
##################### main ###########################
|
||||||
|
|
|
@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox
|
||||||
data action=init_do
|
data action=init_do
|
||||||
data crypto_password=
|
data crypto_password=
|
||||||
data crypto_password2=
|
data crypto_password2=
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox
|
||||||
data action=init_do
|
data action=init_do
|
||||||
data crypto_password=hallo
|
data crypto_password=hallo
|
||||||
data crypto_password2=hall
|
data crypto_password2=hall
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox
|
||||||
data action=init_do
|
data action=init_do
|
||||||
data crypto_password=hallo
|
data crypto_password=hallo
|
||||||
data crypto_password2=hallo
|
data crypto_password2=hallo
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox
|
||||||
data action=init_do
|
data action=init_do
|
||||||
data crypto_password=hallo
|
data crypto_password=hallo
|
||||||
data crypto_password2=hallo
|
data crypto_password2=hallo
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -4,5 +4,5 @@ data crypto_password=hallo
|
||||||
data crypto_password2=hallo
|
data crypto_password2=hallo
|
||||||
data admin_password=root
|
data admin_password=root
|
||||||
data admin_password2=rootA
|
data admin_password2=rootA
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -4,5 +4,5 @@ data crypto_password=hallo
|
||||||
data crypto_password2=hallo
|
data crypto_password2=hallo
|
||||||
data admin_password=root
|
data admin_password=root
|
||||||
data admin_password2=root
|
data admin_password2=root
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -4,5 +4,5 @@ data language=en
|
||||||
data timeout=5
|
data timeout=5
|
||||||
data ip=_HOST_IP_DEFAULT_
|
data ip=_HOST_IP_DEFAULT_
|
||||||
data current_admin_password=rootA
|
data current_admin_password=rootA
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -5,5 +5,5 @@ data crypto_password2=hallo
|
||||||
data current_admin_password=rootA
|
data current_admin_password=rootA
|
||||||
data admin_password=root
|
data admin_password=root
|
||||||
data admin_password2=root
|
data admin_password2=root
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
|
@ -3,5 +3,5 @@ data action=init_do
|
||||||
data crypto_password=hallo
|
data crypto_password=hallo
|
||||||
data crypto_password2=hallo
|
data crypto_password2=hallo
|
||||||
data current_admin_password=root
|
data current_admin_password=root
|
||||||
data confirm=ja%2C%20loesche%20alle%20Daten%21
|
data confirm=_CONFIRM_TEXT_
|
||||||
data weblang=_IFACE_LANG_
|
data weblang=_IFACE_LANG_
|
||||||
|
|
Loading…
Reference in a new issue