From fae808bbffb26fdf036747ef6856a9a2c5948ebf Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 28 Sep 2005 07:38:57 +0000 Subject: [PATCH] validation: confirmation string now depends on language --- scripts/validate.sh | 8 +++++++- validation/test-cases/1-init/020-init_empty_pw/input.curl | 2 +- .../test-cases/1-init/030-init_different_pw/input.curl | 2 +- validation/test-cases/1-init/110-init_valid/input.curl | 2 +- .../test-cases/1-init/190-init_do_during_init/input.curl | 2 +- .../4-admin_pw/010-init_different_admin_pw/input.curl | 2 +- .../4-admin_pw/020-init_with_admin_pw/input.curl | 2 +- .../4-admin_pw/050-config_wrong_admin_pw/input.curl | 2 +- .../4-admin_pw/070-init_wrong_admin_pw/input.curl | 2 +- .../4-admin_pw/200-init_remove_admin_pw/input.curl | 2 +- 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/validate.sh b/scripts/validate.sh index 8065862..3c46bab 100755 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -10,6 +10,9 @@ set -eu # include common functions and settings source $(dirname $0)/common.sh.inc +# extract confirmation text from language file +confirmtext=$(grep "\" "$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 ######################## function do_single() @@ -92,7 +95,10 @@ function import_style() 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 ########################### diff --git a/validation/test-cases/1-init/020-init_empty_pw/input.curl b/validation/test-cases/1-init/020-init_empty_pw/input.curl index f99db42..c5b04d4 100644 --- a/validation/test-cases/1-init/020-init_empty_pw/input.curl +++ b/validation/test-cases/1-init/020-init_empty_pw/input.curl @@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox data action=init_do data crypto_password= data crypto_password2= -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/1-init/030-init_different_pw/input.curl b/validation/test-cases/1-init/030-init_different_pw/input.curl index 3072d2a..f9020f8 100644 --- a/validation/test-cases/1-init/030-init_different_pw/input.curl +++ b/validation/test-cases/1-init/030-init_different_pw/input.curl @@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox data action=init_do data crypto_password=hallo data crypto_password2=hall -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/1-init/110-init_valid/input.curl b/validation/test-cases/1-init/110-init_valid/input.curl index 08f8e91..cf162f3 100644 --- a/validation/test-cases/1-init/110-init_valid/input.curl +++ b/validation/test-cases/1-init/110-init_valid/input.curl @@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox data action=init_do data crypto_password=hallo data crypto_password2=hallo -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/1-init/190-init_do_during_init/input.curl b/validation/test-cases/1-init/190-init_do_during_init/input.curl index 08f8e91..cf162f3 100644 --- a/validation/test-cases/1-init/190-init_do_during_init/input.curl +++ b/validation/test-cases/1-init/190-init_do_during_init/input.curl @@ -2,5 +2,5 @@ url https://_HOST_IP_DEFAULT_/cryptobox data action=init_do data crypto_password=hallo data crypto_password2=hallo -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl b/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl index 457cf9e..8ffca4a 100644 --- a/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl +++ b/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl @@ -4,5 +4,5 @@ data crypto_password=hallo data crypto_password2=hallo data admin_password=root data admin_password2=rootA -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl index dea18c6..767f924 100644 --- a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl +++ b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl @@ -4,5 +4,5 @@ data crypto_password=hallo data crypto_password2=hallo data admin_password=root data admin_password2=root -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/input.curl b/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/input.curl index bb5e1c2..eb1aee8 100644 --- a/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/input.curl +++ b/validation/test-cases/4-admin_pw/050-config_wrong_admin_pw/input.curl @@ -4,5 +4,5 @@ data language=en data timeout=5 data ip=_HOST_IP_DEFAULT_ data current_admin_password=rootA -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl index 443fc42..684cf3a 100644 --- a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl +++ b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl @@ -5,5 +5,5 @@ data crypto_password2=hallo data current_admin_password=rootA data admin_password=root data admin_password2=root -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_ diff --git a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl index 225c276..d7833c3 100644 --- a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl +++ b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl @@ -3,5 +3,5 @@ data action=init_do data crypto_password=hallo data crypto_password2=hallo data current_admin_password=root -data confirm=ja%2C%20loesche%20alle%20Daten%21 +data confirm=_CONFIRM_TEXT_ data weblang=_IFACE_LANG_