diff --git a/.gitignore b/.gitignore index 14d972ee3..cb8c3484f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ sync.sh *.swp .debug .maintenance +.demo .htaccess diff --git a/application/controllers/User.php b/application/controllers/User.php index da470bacb..de70bee62 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -923,75 +923,83 @@ class User extends CI_Controller { */ function forgot_password() { - $this->load->helper(array('form', 'url')); + if (file_exists('.demo')) { - $this->load->library('form_validation'); + $this->session->set_flashdata('error', __("Password Reset is disabled on the Demo!")); + redirect('user/login'); - $this->form_validation->set_rules('email', 'Email', 'required'); + } else { + + $this->load->helper(array('form', 'url')); - if ($this->form_validation->run() == FALSE) - { - $data['page_title'] = __("Forgot Password"); - $this->load->view('interface_assets/mini_header', $data); - $this->load->view('user/forgot_password'); - $this->load->view('interface_assets/footer'); - } - else - { - // Check email address exists - $this->load->model('user_model'); + $this->load->library('form_validation'); - $check_email = $this->user_model->check_email_address($this->input->post('email', true)); + $this->form_validation->set_rules('email', 'Email', 'required'); - if($check_email == TRUE) { - // Generate password reset code 50 characters long - $this->load->helper('string'); - $reset_code = random_string('alnum', 50); + if ($this->form_validation->run() == FALSE) + { + $data['page_title'] = __("Forgot Password"); + $this->load->view('interface_assets/mini_header', $data); + $this->load->view('user/forgot_password'); + $this->load->view('interface_assets/footer'); + } + else + { + // Check email address exists + $this->load->model('user_model'); - $this->user_model->set_password_reset_code($this->input->post('email', true), $reset_code); + $check_email = $this->user_model->check_email_address($this->input->post('email', true)); - // Send email with reset code + if($check_email == TRUE) { + // Generate password reset code 50 characters long + $this->load->helper('string'); + $reset_code = random_string('alnum', 50); - $this->data['reset_code'] = $reset_code; - $this->load->library('email'); + $this->user_model->set_password_reset_code($this->input->post('email', true), $reset_code); - if($this->optionslib->get_option('emailProtocol') == "smtp") { - $config = Array( - 'protocol' => $this->optionslib->get_option('emailProtocol'), - 'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'), - 'smtp_host' => $this->optionslib->get_option('smtpHost'), - 'smtp_port' => $this->optionslib->get_option('smtpPort'), - 'smtp_user' => $this->optionslib->get_option('smtpUsername'), - 'smtp_pass' => $this->optionslib->get_option('smtpPassword'), - 'crlf' => "\r\n", - 'newline' => "\r\n" - ); + // Send email with reset code - $this->email->initialize($config); - } + $this->data['reset_code'] = $reset_code; + $this->load->library('email'); - $message = $this->load->view('email/forgot_password', $this->data, TRUE); + if($this->optionslib->get_option('emailProtocol') == "smtp") { + $config = Array( + 'protocol' => $this->optionslib->get_option('emailProtocol'), + 'smtp_crypto' => $this->optionslib->get_option('smtpEncryption'), + 'smtp_host' => $this->optionslib->get_option('smtpHost'), + 'smtp_port' => $this->optionslib->get_option('smtpPort'), + 'smtp_user' => $this->optionslib->get_option('smtpUsername'), + 'smtp_pass' => $this->optionslib->get_option('smtpPassword'), + 'crlf' => "\r\n", + 'newline' => "\r\n" + ); - $this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName')); - $this->email->to($this->input->post('email', true)); + $this->email->initialize($config); + } - $this->email->subject('Wavelog Account Password Reset'); - $this->email->message($message); + $message = $this->load->view('email/forgot_password', $this->data, TRUE); - if (! $this->email->send()) - { - // Redirect to login page with message - $this->session->set_flashdata('warning', __("Email settings are incorrect.")); - redirect('user/login'); + $this->email->from($this->optionslib->get_option('emailAddress'), $this->optionslib->get_option('emailSenderName')); + $this->email->to($this->input->post('email', true)); + + $this->email->subject('Wavelog Account Password Reset'); + $this->email->message($message); + + if (! $this->email->send()) + { + // Redirect to login page with message + $this->session->set_flashdata('warning', __("Email settings are incorrect.")); + redirect('user/login'); + } else { + // Redirect to login page with message + $this->session->set_flashdata('notice', __("Password Reset Processed.")); + redirect('user/login'); + } } else { - // Redirect to login page with message + // No account found just return to login page $this->session->set_flashdata('notice', __("Password Reset Processed.")); redirect('user/login'); } - } else { - // No account found just return to login page - $this->session->set_flashdata('notice', __("Password Reset Processed.")); - redirect('user/login'); } } } diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 5aff14d0f..2624d5052 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:25+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bulgarian Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/cs_CZ/LC_MESSAGES/messages.po b/application/locale/cs_CZ/LC_MESSAGES/messages.po index a5f6e861e..e9936bc65 100644 --- a/application/locale/cs_CZ/LC_MESSAGES/messages.po +++ b/application/locale/cs_CZ/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-10 20:23+0000\n" "Last-Translator: Ondřej Koloničný \n" "Language-Team: Czech Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "Zapomněli jste heslo?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/de_DE/LC_MESSAGES/messages.mo b/application/locale/de_DE/LC_MESSAGES/messages.mo index 1921e385b..b53f2934f 100644 Binary files a/application/locale/de_DE/LC_MESSAGES/messages.mo and b/application/locale/de_DE/LC_MESSAGES/messages.mo differ diff --git a/application/locale/de_DE/LC_MESSAGES/messages.po b/application/locale/de_DE/LC_MESSAGES/messages.po index 2cbb69d83..76820731e 100644 --- a/application/locale/de_DE/LC_MESSAGES/messages.po +++ b/application/locale/de_DE/LC_MESSAGES/messages.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" -"PO-Revision-Date: 2024-07-12 18:50+0000\n" -"Last-Translator: Byt3 \n" +"POT-Creation-Date: 2024-07-13 09:43+0000\n" +"PO-Revision-Date: 2024-07-13 09:39+0000\n" +"Last-Translator: Fabian Berg \n" "Language-Team: German \n" "Language: de_DE\n" @@ -1942,7 +1942,7 @@ msgstr "Login fehlgeschlagen. Bitte erneut versuchen." #: application/controllers/User.php:855 #: application/views/interface_assets/header.php:348 -#: application/views/user/login.php:67 +#: application/views/user/login.php:89 #: application/views/visitor/layout/header.php:88 msgid "Login" msgstr "Anmeldung" @@ -1971,19 +1971,23 @@ msgstr "Falscher Benutzername oder Passwort!" msgid "User %s logged out." msgstr "Benutzer %s ausgeloggt." -#: application/controllers/User.php:934 +#: application/controllers/User.php:928 +msgid "Password Reset is disabled on the Demo!" +msgstr "Passwort Reset ist in der Demo nicht verfügbar!" + +#: application/controllers/User.php:941 msgid "Forgot Password" msgstr "Passwort vergessen" -#: application/controllers/User.php:984 application/views/user/main.php:8 +#: application/controllers/User.php:991 application/views/user/main.php:8 msgid "Email settings are incorrect." msgstr "E-Mail Einstellungen sind nicht korrekt." -#: application/controllers/User.php:988 application/controllers/User.php:993 +#: application/controllers/User.php:995 application/controllers/User.php:1000 msgid "Password Reset Processed." msgstr "Passwort Zurücksetzen angefordert." -#: application/controllers/User.php:1094 +#: application/controllers/User.php:1102 #: application/views/user/forgot_password.php:51 #: application/views/user/reset_password.php:8 #: application/views/user/reset_password.php:35 @@ -1997,14 +2001,14 @@ msgstr "Passwort zurücksetzen" #: application/controllers/Visitor.php:197 #: application/controllers/Visitor.php:474 msgid "Unknown Public Page." -msgstr "" +msgstr "Unbekannte Öffentliche Seite." #: application/controllers/Visitor.php:74 #: application/controllers/Visitor.php:163 #: application/controllers/Visitor.php:193 #: application/controllers/Visitor.php:470 msgid "Empty Logbook" -msgstr "" +msgstr "Leeres Logbuch" #: application/controllers/Visitor.php:203 msgid "Satellite Gridsquare Map" @@ -5949,8 +5953,8 @@ msgid "" "Use this if you have lots of QSOs to upload to eQSL it will save the server " "timing out." msgstr "" -"Benutze das, wenn du sehr viele QSOs zu eQSL hochzuladen hast und einen " -"Server TimeOut umgehen willst." +"Verwende diese Option, wenn du sehr viele QSOs zu eQSL hochzuladen hast und " +"einen Server-Timeout verhindern willst." #: application/views/eqslcard/index.php:10 #, php-format @@ -9983,13 +9987,14 @@ msgstr "Benutzerkonto editieren" msgid "General Information" msgstr "Generelle Informationen" -#: application/views/user/edit.php:52 application/views/user/login.php:45 -#: application/views/user/login.php:46 application/views/user/profile.php:14 +#: application/views/user/edit.php:52 application/views/user/login.php:58 +#: application/views/user/login.php:67 application/views/user/login.php:68 +#: application/views/user/profile.php:14 msgid "Username" msgstr "Benutzername" -#: application/views/user/edit.php:64 application/views/user/login.php:49 -#: application/views/user/login.php:50 +#: application/views/user/edit.php:64 application/views/user/login.php:59 +#: application/views/user/login.php:71 application/views/user/login.php:72 #: application/views/user/reset_password.php:21 #: application/views/user/reset_password.php:23 #: application/views/user/reset_password.php:30 @@ -10395,11 +10400,26 @@ msgstr "Du kannst dein Passwort hier zurücksetzen." msgid "MAINTENANCE MODE" msgstr "WARTUNGSMODUS" -#: application/views/user/login.php:55 +#: application/views/user/login.php:56 +msgid "Welcome to the Demo of Wavelog" +msgstr "Willkommen zur Demo von Wavelog" + +#: application/views/user/login.php:57 +msgid "This demo will be reset every night at 0200z." +msgstr "Diese Demo wird jede Nacht um 0200z zurückgesetzt." + +#: application/views/user/login.php:60 +#, php-format +msgid "" +"More Information about Wavelog on Github." +msgstr "" +"Mehr Informationen über Wavelog auf Github." + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "Angemeldet bleiben" diff --git a/application/locale/el_GR/LC_MESSAGES/messages.po b/application/locale/el_GR/LC_MESSAGES/messages.po index 3faa463c5..7b0287ff2 100644 --- a/application/locale/el_GR/LC_MESSAGES/messages.po +++ b/application/locale/el_GR/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:25+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: Greek Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/es_ES/LC_MESSAGES/messages.po b/application/locale/es_ES/LC_MESSAGES/messages.po index 44ad49f6f..994b020c2 100644 --- a/application/locale/es_ES/LC_MESSAGES/messages.po +++ b/application/locale/es_ES/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:25+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Spanish Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "¿Olvidó su contraseña?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/fi_FI/LC_MESSAGES/messages.po b/application/locale/fi_FI/LC_MESSAGES/messages.po index d3ed0213e..f50ea675b 100644 --- a/application/locale/fi_FI/LC_MESSAGES/messages.po +++ b/application/locale/fi_FI/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:25+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Finnish Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "Salasana unohtunut?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/fr_FR/LC_MESSAGES/messages.mo b/application/locale/fr_FR/LC_MESSAGES/messages.mo index 273331acc..765804d0f 100644 Binary files a/application/locale/fr_FR/LC_MESSAGES/messages.mo and b/application/locale/fr_FR/LC_MESSAGES/messages.mo differ diff --git a/application/locale/fr_FR/LC_MESSAGES/messages.po b/application/locale/fr_FR/LC_MESSAGES/messages.po index d11ce8810..59065961a 100644 --- a/application/locale/fr_FR/LC_MESSAGES/messages.po +++ b/application/locale/fr_FR/LC_MESSAGES/messages.po @@ -3,12 +3,13 @@ # This file is distributed under the MIT licence. # # Aurélien Barrau , 2024. +# Byt3 , 2024. msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" -"PO-Revision-Date: 2024-07-09 13:26+0000\n" -"Last-Translator: Aurélien Barrau \n" +"POT-Creation-Date: 2024-07-13 09:43+0000\n" +"PO-Revision-Date: 2024-07-13 09:35+0000\n" +"Last-Translator: Byt3 \n" "Language-Team: French \n" "Language: fr_FR\n" @@ -16,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 5.6\n" +"X-Generator: Weblate 5.6.2\n" #: application/controllers/Accumulated.php:21 #: application/views/interface_assets/header.php:148 @@ -227,7 +228,7 @@ msgstr "VUCC" #: application/controllers/Awards.php:405 msgid "Log View - VUCC" -msgstr "" +msgstr "Vue du journal - VUCC" #: application/controllers/Awards.php:453 #: application/controllers/Timeline.php:92 @@ -236,7 +237,7 @@ msgstr "" #: application/controllers/Timeline.php:101 #: application/controllers/Timeline.php:104 msgid "Log View" -msgstr "" +msgstr "Vue du journal" #: application/controllers/Awards.php:457 msgid " and sat " @@ -326,7 +327,7 @@ msgstr "POTA" #: application/controllers/Awards.php:591 msgid "CQ Magazine WAZ" -msgstr "" +msgstr "CQ Magazine WAZ" #: application/controllers/Awards.php:652 #: application/views/accumulate/index.php:58 @@ -1924,7 +1925,7 @@ msgstr "" #: application/controllers/User.php:855 #: application/views/interface_assets/header.php:348 -#: application/views/user/login.php:67 +#: application/views/user/login.php:89 #: application/views/visitor/layout/header.php:88 msgid "Login" msgstr "" @@ -1949,19 +1950,23 @@ msgstr "" msgid "User %s logged out." msgstr "" -#: application/controllers/User.php:934 +#: application/controllers/User.php:928 +msgid "Password Reset is disabled on the Demo!" +msgstr "" + +#: application/controllers/User.php:941 msgid "Forgot Password" msgstr "" -#: application/controllers/User.php:984 application/views/user/main.php:8 +#: application/controllers/User.php:991 application/views/user/main.php:8 msgid "Email settings are incorrect." msgstr "" -#: application/controllers/User.php:988 application/controllers/User.php:993 +#: application/controllers/User.php:995 application/controllers/User.php:1000 msgid "Password Reset Processed." msgstr "" -#: application/controllers/User.php:1094 +#: application/controllers/User.php:1102 #: application/views/user/forgot_password.php:51 #: application/views/user/reset_password.php:8 #: application/views/user/reset_password.php:35 @@ -9517,13 +9522,14 @@ msgstr "Editer un compte" msgid "General Information" msgstr "Informations Générales" -#: application/views/user/edit.php:52 application/views/user/login.php:45 -#: application/views/user/login.php:46 application/views/user/profile.php:14 +#: application/views/user/edit.php:52 application/views/user/login.php:58 +#: application/views/user/login.php:67 application/views/user/login.php:68 +#: application/views/user/profile.php:14 msgid "Username" msgstr "Utilisateur" -#: application/views/user/edit.php:64 application/views/user/login.php:49 -#: application/views/user/login.php:50 +#: application/views/user/edit.php:64 application/views/user/login.php:59 +#: application/views/user/login.php:71 application/views/user/login.php:72 #: application/views/user/reset_password.php:21 #: application/views/user/reset_password.php:23 #: application/views/user/reset_password.php:30 @@ -9921,11 +9927,25 @@ msgstr "Vous pouvez réinitialiser votre mot de passe ici." msgid "MAINTENANCE MODE" msgstr "" -#: application/views/user/login.php:55 +#: application/views/user/login.php:56 +msgid "Welcome to the Demo of Wavelog" +msgstr "" + +#: application/views/user/login.php:57 +msgid "This demo will be reset every night at 0200z." +msgstr "" + +#: application/views/user/login.php:60 +#, php-format +msgid "" +"More Information about Wavelog on Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "Mot de passe oublié ?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/it_IT/LC_MESSAGES/messages.po b/application/locale/it_IT/LC_MESSAGES/messages.po index 29adba857..17c1efeb2 100644 --- a/application/locale/it_IT/LC_MESSAGES/messages.po +++ b/application/locale/it_IT/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:26+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Italian Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/nl_NL/LC_MESSAGES/messages.po b/application/locale/nl_NL/LC_MESSAGES/messages.po index 8e3050601..ecef0eb8f 100644 --- a/application/locale/nl_NL/LC_MESSAGES/messages.po +++ b/application/locale/nl_NL/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:26+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Dutch Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/pl_PL/LC_MESSAGES/messages.po b/application/locale/pl_PL/LC_MESSAGES/messages.po index d2c26c7a8..000e0e0df 100644 --- a/application/locale/pl_PL/LC_MESSAGES/messages.po +++ b/application/locale/pl_PL/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:26+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Polish Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/ru_RU/LC_MESSAGES/messages.po b/application/locale/ru_RU/LC_MESSAGES/messages.po index f9957ec17..dde4912ca 100644 --- a/application/locale/ru_RU/LC_MESSAGES/messages.po +++ b/application/locale/ru_RU/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-12 05:15+0000\n" "Last-Translator: Michael Skolsky \n" "Language-Team: Russian Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "Забыли пароль?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "Оставаться в системе" diff --git a/application/locale/sv_SE/LC_MESSAGES/messages.po b/application/locale/sv_SE/LC_MESSAGES/messages.po index db82cd23f..e057a9ca5 100644 --- a/application/locale/sv_SE/LC_MESSAGES/messages.po +++ b/application/locale/sv_SE/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:26+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Swedish Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "Glömt lösenord?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/tr_TR/LC_MESSAGES/messages.po b/application/locale/tr_TR/LC_MESSAGES/messages.po index 1d5cf9b97..d2407aa6b 100644 --- a/application/locale/tr_TR/LC_MESSAGES/messages.po +++ b/application/locale/tr_TR/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-09 13:26+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Turkish Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/locale/zh_CN/LC_MESSAGES/messages.po b/application/locale/zh_CN/LC_MESSAGES/messages.po index 1ca585afa..51a9756f0 100644 --- a/application/locale/zh_CN/LC_MESSAGES/messages.po +++ b/application/locale/zh_CN/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:15+0000\n" +"POT-Creation-Date: 2024-07-13 09:35+0000\n" "PO-Revision-Date: 2024-07-11 15:53+0000\n" "Last-Translator: Karuru \n" "Language-Team: Chinese (Simplified) Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "忘记密码?" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/application/views/user/login.php b/application/views/user/login.php index ac32a36f3..2bb2271e7 100644 --- a/application/views/user/login.php +++ b/application/views/user/login.php @@ -38,16 +38,38 @@
+ +
+
+



+ : demo
+ : demo

+ Github."), "https://www.github.com/wavelog/wavelog"); ?>

+
+
form_validation->set_error_delimiters('', ''); ?>
- " value="input->post('user_name'); ?>" autofocus> + " value="input->post('user_name'); ?>" autofocus>
- "> + ">
diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index 728c3ca75..a3e5ca4e6 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:42+0000\n" +"POT-Creation-Date: 2024-07-13 09:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1916,7 +1916,7 @@ msgstr "" #: application/controllers/User.php:855 #: application/views/interface_assets/header.php:348 -#: application/views/user/login.php:67 +#: application/views/user/login.php:89 #: application/views/visitor/layout/header.php:88 msgid "Login" msgstr "" @@ -1941,19 +1941,23 @@ msgstr "" msgid "User %s logged out." msgstr "" -#: application/controllers/User.php:934 +#: application/controllers/User.php:928 +msgid "Password Reset is disabled on the Demo!" +msgstr "" + +#: application/controllers/User.php:941 msgid "Forgot Password" msgstr "" -#: application/controllers/User.php:984 application/views/user/main.php:8 +#: application/controllers/User.php:991 application/views/user/main.php:8 msgid "Email settings are incorrect." msgstr "" -#: application/controllers/User.php:988 application/controllers/User.php:993 +#: application/controllers/User.php:995 application/controllers/User.php:1000 msgid "Password Reset Processed." msgstr "" -#: application/controllers/User.php:1094 +#: application/controllers/User.php:1102 #: application/views/user/forgot_password.php:51 #: application/views/user/reset_password.php:8 #: application/views/user/reset_password.php:35 @@ -9453,13 +9457,14 @@ msgstr "" msgid "General Information" msgstr "" -#: application/views/user/edit.php:52 application/views/user/login.php:45 -#: application/views/user/login.php:46 application/views/user/profile.php:14 +#: application/views/user/edit.php:52 application/views/user/login.php:58 +#: application/views/user/login.php:67 application/views/user/login.php:68 +#: application/views/user/profile.php:14 msgid "Username" msgstr "" -#: application/views/user/edit.php:64 application/views/user/login.php:49 -#: application/views/user/login.php:50 +#: application/views/user/edit.php:64 application/views/user/login.php:59 +#: application/views/user/login.php:71 application/views/user/login.php:72 #: application/views/user/reset_password.php:21 #: application/views/user/reset_password.php:23 #: application/views/user/reset_password.php:30 @@ -9843,11 +9848,25 @@ msgstr "" msgid "MAINTENANCE MODE" msgstr "" -#: application/views/user/login.php:55 +#: application/views/user/login.php:56 +msgid "Welcome to the Demo of Wavelog" +msgstr "" + +#: application/views/user/login.php:57 +msgid "This demo will be reset every night at 0200z." +msgstr "" + +#: application/views/user/login.php:60 +#, php-format +msgid "" +"More Information about Wavelog on Github." +msgstr "" + +#: application/views/user/login.php:77 msgid "Forgot your password?" msgstr "" -#: application/views/user/login.php:61 +#: application/views/user/login.php:83 msgid "Keep me logged in" msgstr "" diff --git a/install/includes/gettext/lang_src/installer.pot b/install/includes/gettext/lang_src/installer.pot index 3ae62d970..80ff00eec 100644 --- a/install/includes/gettext/lang_src/installer.pot +++ b/install/includes/gettext/lang_src/installer.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-12 21:42+0000\n" +"POT-Creation-Date: 2024-07-13 09:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.mo b/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.mo index a2f5becf1..1345dbfec 100644 Binary files a/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.mo and b/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.mo differ diff --git a/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.po b/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.po index fbf2f603b..c6cdb90f0 100644 --- a/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.po +++ b/install/includes/gettext/locale/fr_FR/LC_MESSAGES/installer.po @@ -2,43 +2,45 @@ # Copyright (c) 2024 Wavelog by DF2ET, DJ7NT, HB9HIL and LA8AJA. # This file is distributed under the MIT licence. # +# Byt3 , 2024. msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" "POT-Creation-Date: 2024-07-11 18:33+0000\n" -"PO-Revision-Date: 2024-06-05 15:15+0200\n" -"Last-Translator: \n" -"Language-Team: \n" +"PO-Revision-Date: 2024-07-12 21:15+0000\n" +"Last-Translator: Byt3 \n" +"Language-Team: French \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4.4\n" +"X-Generator: Weblate 5.6.2\n" #: install/index.php:215 msgid "Install | Wavelog" -msgstr "" +msgstr "Installer | Wavelog" #: install/index.php:239 msgid "1. Welcome" -msgstr "" +msgstr "1. Bienvenue" #: install/index.php:242 msgid "2. Pre Checks" -msgstr "" +msgstr "2. Pré-vérification" #: install/index.php:245 msgid "3. Configuration" -msgstr "" +msgstr "3. Configuration" #: install/index.php:248 msgid "4. Database" -msgstr "" +msgstr "4. Base de données" #: install/index.php:251 msgid "5. First User" -msgstr "" +msgstr "5. Premier utilisateur" #: install/index.php:254 msgid "6. Finish" @@ -46,7 +48,7 @@ msgstr "" #: install/index.php:271 msgid "Welcome to the Wavelog Installer" -msgstr "" +msgstr "Bienvenue dans l'installateur de Wavelog" #: install/index.php:272 msgid "" @@ -69,43 +71,43 @@ msgstr "" #: install/index.php:273 msgid "Wiki" -msgstr "" +msgstr "Wiki" #: install/index.php:274 msgid "Thank you for installing Wavelog!" -msgstr "" +msgstr "Merci d'avoir installé Wavelog!" #: install/index.php:275 install/index.php:278 install/index.php:1125 msgid "Language" -msgstr "" +msgstr "Langue" #: install/index.php:288 msgid "Select a language" -msgstr "" +msgstr "Choisir une langue" #: install/index.php:301 msgid "Close" -msgstr "" +msgstr "Fermer" #: install/index.php:311 msgid "PHP Modules" -msgstr "" +msgstr "PHP Modules" #: install/index.php:318 msgid "Version" -msgstr "" +msgstr "Version" #: install/index.php:340 msgid "Installed" -msgstr "" +msgstr "Installé" #: install/index.php:340 msgid "Not Installed" -msgstr "" +msgstr "pas installé" #: install/index.php:348 msgid "PHP Settings" -msgstr "" +msgstr "Paramètres de PHP" #: install/index.php:412 msgid "On" @@ -117,7 +119,7 @@ msgstr "" #: install/index.php:423 msgid "MySQL / MariaDB" -msgstr "" +msgstr "MySQL / MariaDB" #: install/index.php:426 msgid "Min. MySQL Version:" @@ -125,7 +127,7 @@ msgstr "" #: install/index.php:430 msgid "or" -msgstr "" +msgstr "ou" #: install/index.php:434 msgid "Min. MariaDB Version:"