From b92a134238e92d4fcd59b9c017652e736e0eb2cb Mon Sep 17 00:00:00 2001 From: Jeroen Peelaerts Date: Wed, 14 Jul 2021 09:11:47 +0200 Subject: [PATCH] Show migration success message (#3206) --- application/controllers/Login.php | 1 + application/language/ar-EG/login_lang.php | 1 + application/language/ar-LB/login_lang.php | 1 + application/language/az-AZ/login_lang.php | 1 + application/language/bg/login_lang.php | 1 + application/language/bs-BA/login_lang.php | 1 + application/language/cs/login_lang.php | 1 + application/language/da/login_lang.php | 1 + application/language/de-CH/login_lang.php | 1 + application/language/de/login_lang.php | 1 + application/language/el/login_lang.php | 1 + application/language/en-GB/login_lang.php | 1 + application/language/en-US/login_lang.php | 1 + application/language/es/login_lang.php | 1 + application/language/es_MX/login_lang.php | 1 + application/language/fa-IR/login_lang.php | 1 + application/language/fr/login_lang.php | 1 + application/language/he/login_lang.php | 1 + application/language/hr-HR/login_lang.php | 1 + application/language/hu-HU/login_lang.php | 1 + application/language/hy/login_lang.php | 1 + application/language/id/login_lang.php | 1 + application/language/it/login_lang.php | 1 + application/language/km/login_lang.php | 1 + application/language/lo/login_lang.php | 1 + application/language/ml/login_lang.php | 1 + application/language/nb_NO/login_lang.php | 1 + application/language/nl-BE/login_lang.php | 3 +- application/language/nl/login_lang.php | 1 + application/language/pl/attributes_lang.php | 2 +- application/language/pl/login_lang.php | 1 + application/language/pt-BR/login_lang.php | 1 + application/language/ro/login_lang.php | 1 + application/language/ru/login_lang.php | 1 + application/language/sv/login_lang.php | 1 + application/language/ta/login_lang.php | 1 + application/language/th/login_lang.php | 1 + application/language/tl-PH/login_lang.php | 1 + application/language/tr/login_lang.php | 1 + application/language/uk-UA/login_lang.php | 1 + application/language/ur_PK/login_lang.php | 1 + application/language/vi/login_lang.php | 1 + application/language/zh-Hans/login_lang.php | 1 + application/language/zh-Hant/login_lang.php | 1 + application/views/login.php | 129 ++++++++++++-------- 45 files changed, 120 insertions(+), 56 deletions(-) diff --git a/application/controllers/Login.php b/application/controllers/Login.php index 3d8a27178..500faa30e 100644 --- a/application/controllers/Login.php +++ b/application/controllers/Login.php @@ -48,6 +48,7 @@ class Login extends CI_Controller set_time_limit(3600); // trigger any required upgrade before starting the application $this->migration->latest(); + $this->session->userdata('migration_success', true); } if(!$this->Employee->login($username, $password)) diff --git a/application/language/ar-EG/login_lang.php b/application/language/ar-EG/login_lang.php index 040fa864c..2f9fb7cc8 100644 --- a/application/language/ar-EG/login_lang.php +++ b/application/language/ar-EG/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة س $lang["login_login"] = "دخول"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "كلمة السر"; $lang["login_username"] = "اسم المستخدم"; $lang["login_welcome"] = ""; diff --git a/application/language/ar-LB/login_lang.php b/application/language/ar-LB/login_lang.php index 040fa864c..2f9fb7cc8 100644 --- a/application/language/ar-LB/login_lang.php +++ b/application/language/ar-LB/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة س $lang["login_login"] = "دخول"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "كلمة السر"; $lang["login_username"] = "اسم المستخدم"; $lang["login_welcome"] = ""; diff --git a/application/language/az-AZ/login_lang.php b/application/language/az-AZ/login_lang.php index b4b416e30..e4146c935 100644 --- a/application/language/az-AZ/login_lang.php +++ b/application/language/az-AZ/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Ad və ya şifrə səhvdir."; $lang["login_login"] = "Giriş"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Şifrə"; $lang["login_username"] = "İstifadəçi"; $lang["login_welcome"] = ""; diff --git a/application/language/bg/login_lang.php b/application/language/bg/login_lang.php index 1dc9bba9a..aa8eaa12b 100644 --- a/application/language/bg/login_lang.php +++ b/application/language/bg/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Invalid Username or Password."; $lang["login_login"] = "Login"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Password"; $lang["login_username"] = "Username"; $lang["login_welcome"] = ""; diff --git a/application/language/bs-BA/login_lang.php b/application/language/bs-BA/login_lang.php index b5fd74559..0110fd129 100755 --- a/application/language/bs-BA/login_lang.php +++ b/application/language/bs-BA/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Pogrešno korisničko ime ili lo $lang["login_login"] = "Prijava"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Lozinka"; $lang["login_username"] = "Korisničko ime"; $lang["login_welcome"] = ""; diff --git a/application/language/cs/login_lang.php b/application/language/cs/login_lang.php index 803b1ec8c..0ce4a31c2 100644 --- a/application/language/cs/login_lang.php +++ b/application/language/cs/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Neplatné jméno nebo heslo."; $lang["login_login"] = "Login"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Heslo"; $lang["login_username"] = "Uživatelské jméno"; $lang["login_welcome"] = ""; diff --git a/application/language/da/login_lang.php b/application/language/da/login_lang.php index 5b6b148ab..d00adc6a6 100644 --- a/application/language/da/login_lang.php +++ b/application/language/da/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = ""; $lang["login_login"] = ""; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = ""; $lang["login_username"] = ""; $lang["login_welcome"] = ""; diff --git a/application/language/de-CH/login_lang.php b/application/language/de-CH/login_lang.php index e85811c4e..857aea2b5 100644 --- a/application/language/de-CH/login_lang.php +++ b/application/language/de-CH/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Ungültiger Benutzername/Passwor $lang["login_login"] = "Login"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Passwort"; $lang["login_username"] = "Benutzername"; $lang["login_welcome"] = ""; diff --git a/application/language/de/login_lang.php b/application/language/de/login_lang.php index dcefffa3d..0bc7fab1d 100644 --- a/application/language/de/login_lang.php +++ b/application/language/de/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Ungültiger Benutzername oder Pa $lang["login_login"] = "Login"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Passwort"; $lang["login_username"] = "Benutzername"; $lang["login_welcome"] = ""; diff --git a/application/language/el/login_lang.php b/application/language/el/login_lang.php index 5b6b148ab..d00adc6a6 100644 --- a/application/language/el/login_lang.php +++ b/application/language/el/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = ""; $lang["login_login"] = ""; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = ""; $lang["login_username"] = ""; $lang["login_welcome"] = ""; diff --git a/application/language/en-GB/login_lang.php b/application/language/en-GB/login_lang.php index fac34ec9a..8b90628b4 100644 --- a/application/language/en-GB/login_lang.php +++ b/application/language/en-GB/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Invalid Username or Password"; $lang["login_login"] = "Login"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = "Database migration to %1 was successful. Please login again."; $lang["login_password"] = "Password"; $lang["login_username"] = "Username"; $lang["login_welcome"] = ""; diff --git a/application/language/en-US/login_lang.php b/application/language/en-US/login_lang.php index 68b181f40..63e2da7a2 100644 --- a/application/language/en-US/login_lang.php +++ b/application/language/en-US/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Invalid username and/or password $lang["login_login"] = "Login"; $lang["login_logout"] = "Logout"; $lang["login_migration_needed"] = "A database migration to %1 will start after login."; +$lang["login_migration_success"] = "Database migration to %1 was successful. Please login again."; $lang["login_password"] = "Password"; $lang["login_username"] = "Username"; $lang["login_welcome"] = "Welcome to %1!"; diff --git a/application/language/es/login_lang.php b/application/language/es/login_lang.php index 1cc6a1740..fe2712ff0 100644 --- a/application/language/es/login_lang.php +++ b/application/language/es/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Usuario o Contraseña no válido $lang["login_login"] = "Iniciar Sesión"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Contraseña"; $lang["login_username"] = "Usuario"; $lang["login_welcome"] = ""; diff --git a/application/language/es_MX/login_lang.php b/application/language/es_MX/login_lang.php index 5b6b148ab..d00adc6a6 100644 --- a/application/language/es_MX/login_lang.php +++ b/application/language/es_MX/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = ""; $lang["login_login"] = ""; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = ""; $lang["login_username"] = ""; $lang["login_welcome"] = ""; diff --git a/application/language/fa-IR/login_lang.php b/application/language/fa-IR/login_lang.php index ee04bbfbd..0d5f2d2c7 100644 --- a/application/language/fa-IR/login_lang.php +++ b/application/language/fa-IR/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "نام کاربری یا گذر $lang["login_login"] = "وارد شدن"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "کلمه عبور"; $lang["login_username"] = "نام کاربری"; $lang["login_welcome"] = ""; diff --git a/application/language/fr/login_lang.php b/application/language/fr/login_lang.php index a1fd93316..1c5cf4a98 100644 --- a/application/language/fr/login_lang.php +++ b/application/language/fr/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Entrée invalide."; $lang["login_login"] = "Login"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Mot de passe"; $lang["login_username"] = "Nom d'utilisateur"; $lang["login_welcome"] = ""; diff --git a/application/language/he/login_lang.php b/application/language/he/login_lang.php index 7dfc4cf9b..773bd18dc 100644 --- a/application/language/he/login_lang.php +++ b/application/language/he/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "שם משתמש או סיסמה $lang["login_login"] = "כניסה"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "סיסמה"; $lang["login_username"] = "שם משתמש"; $lang["login_welcome"] = ""; diff --git a/application/language/hr-HR/login_lang.php b/application/language/hr-HR/login_lang.php index 03a6c841f..50347f238 100644 --- a/application/language/hr-HR/login_lang.php +++ b/application/language/hr-HR/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Neispravno ime/lozinka"; $lang["login_login"] = "Prijava"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Lozinka"; $lang["login_username"] = "Korisničko ime"; $lang["login_welcome"] = ""; diff --git a/application/language/hu-HU/login_lang.php b/application/language/hu-HU/login_lang.php index 65027061d..484d81c27 100644 --- a/application/language/hu-HU/login_lang.php +++ b/application/language/hu-HU/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Érvénytelen felhasználói né $lang["login_login"] = "Belépés"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Jelszó"; $lang["login_username"] = "Felhasználó név"; $lang["login_welcome"] = ""; diff --git a/application/language/hy/login_lang.php b/application/language/hy/login_lang.php index 5b6b148ab..d00adc6a6 100644 --- a/application/language/hy/login_lang.php +++ b/application/language/hy/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = ""; $lang["login_login"] = ""; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = ""; $lang["login_username"] = ""; $lang["login_welcome"] = ""; diff --git a/application/language/id/login_lang.php b/application/language/id/login_lang.php index ee947c61d..1b20dc550 100644 --- a/application/language/id/login_lang.php +++ b/application/language/id/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Nama Pengguna/Kata Kunci Salah." $lang["login_login"] = "Masuk"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Kata kunci"; $lang["login_username"] = "Nama Anda"; $lang["login_welcome"] = ""; diff --git a/application/language/it/login_lang.php b/application/language/it/login_lang.php index f2a6f3fb9..0ef3dd747 100644 --- a/application/language/it/login_lang.php +++ b/application/language/it/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Username or Password non validi. $lang["login_login"] = "Login"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Password"; $lang["login_username"] = "Username"; $lang["login_welcome"] = ""; diff --git a/application/language/km/login_lang.php b/application/language/km/login_lang.php index 7f90d228b..5eda15de6 100644 --- a/application/language/km/login_lang.php +++ b/application/language/km/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "ឈ្មោះឬក៏ពា $lang["login_login"] = "ចូល"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "ពាក្យសំងាត់"; $lang["login_username"] = "ឈ្មោះ"; $lang["login_welcome"] = ""; diff --git a/application/language/lo/login_lang.php b/application/language/lo/login_lang.php index 87383fc7a..7551a2a2d 100644 --- a/application/language/lo/login_lang.php +++ b/application/language/lo/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Username ຫຼື Password ບ $lang["login_login"] = "ເຂົ້າລະບົບ"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Password"; $lang["login_username"] = "Username"; $lang["login_welcome"] = ""; diff --git a/application/language/ml/login_lang.php b/application/language/ml/login_lang.php index 5b6b148ab..d00adc6a6 100644 --- a/application/language/ml/login_lang.php +++ b/application/language/ml/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = ""; $lang["login_login"] = ""; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = ""; $lang["login_username"] = ""; $lang["login_welcome"] = ""; diff --git a/application/language/nb_NO/login_lang.php b/application/language/nb_NO/login_lang.php index 5b6b148ab..d00adc6a6 100644 --- a/application/language/nb_NO/login_lang.php +++ b/application/language/nb_NO/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = ""; $lang["login_login"] = ""; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = ""; $lang["login_username"] = ""; $lang["login_welcome"] = ""; diff --git a/application/language/nl-BE/login_lang.php b/application/language/nl-BE/login_lang.php index 7ba54a0c2..297f1714f 100755 --- a/application/language/nl-BE/login_lang.php +++ b/application/language/nl-BE/login_lang.php @@ -7,7 +7,8 @@ $lang["login_invalid_installation"] = "De installatie is onvolledig. Kijk uw php $lang["login_invalid_username_and_password"] = "Ongeldige gebruiker of paswoord."; $lang["login_login"] = "Login"; $lang["login_logout"] = ""; -$lang["login_migration_needed"] = ""; +$lang["login_migration_needed"] = "Een database migratie naar %1 zal starten na de login."; +$lang["login_migration_success"] = "Database migratie to %1 is geslaagd. Login opnieuw in."; $lang["login_password"] = "Paswoord"; $lang["login_username"] = "Gebruiker"; $lang["login_welcome"] = ""; diff --git a/application/language/nl/login_lang.php b/application/language/nl/login_lang.php index 967dadd84..80c8512f8 100644 --- a/application/language/nl/login_lang.php +++ b/application/language/nl/login_lang.php @@ -8,6 +8,7 @@ $lang["login_invalid_username_and_password"] = "Ongeldige gebruikersnaam of wach $lang["login_login"] = "Aanmelden"; $lang["login_logout"] = ""; $lang["login_migration_needed"] = ""; +$lang["login_migration_success"] = ""; $lang["login_password"] = "Wachtwoord"; $lang["login_username"] = "Gebruikersnaam"; $lang["login_welcome"] = ""; diff --git a/application/language/pl/attributes_lang.php b/application/language/pl/attributes_lang.php index b17f72a69..9640bb310 100644 --- a/application/language/pl/attributes_lang.php +++ b/application/language/pl/attributes_lang.php @@ -1,6 +1,6 @@ -
+
-
-
+
+ +