commit 75b59dd0f156f72252f206a89062ce9d2d6bdf8a
parent 8a2335526e490974a3a5f660d306703d506da81d
Author: Jan Dankert <devnull@localhost>
Date: Fri, 21 Sep 2018 00:20:13 +0200
Fix: Charset ist für alle Sprachen immer UTF-8.
Diffstat:
8 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/modules/language/lang-cn.php b/modules/language/lang-cn.php
@@ -560,7 +560,7 @@ function language() { return array(
'MAIL_SUBJECT_PASSWORD_NEW'=>"New password",
'MAIL_SUBJECT_REGISTER_COMMIT_CODE'=>"Your registration code",
'MAIL_SUBJECT_USER_MAIL'=>"Your password",
-'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;Enter the following code to verify your e-Mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
+'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;you are receiving this mail, because you want to change your e-mail-adresse.;;Enter the following code to verify your e-mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
'MAIL_TEXT_PASSWORD_COMMIT_CODE'=>"Hello {name};;your code for requesting a new password is: {code};;Please insert this number into the input field.;;If you have not request a new password, please ignore this e-mail. In this case, your password will stay unchanged.;;Thank you.",
'MAIL_TEXT_PASSWORD_NEW'=>"Hello {name};;your new password: {password};;Please note this password at a secure place and delete this mail.;;Thank you.",
'MAIL_TEXT_REGISTER_COMMIT_CODE'=>"Hello,;;you (or another person) has requested a registration code.;;Your registration code: {code}.;;Please insert this number into the input field.;;Thank you.",
@@ -1254,7 +1254,7 @@ function language() { return array(
'USER_MAIL_SUBJECT'=>"Your Password",
'USER_MAIL_TEXT_PREFIX'=>"Your Password for logging in to OpenRat Content Management System is:",
'USER_MAIL_TEXT_SUFFIX'=>"Note this password at a secure place and remove this E-Mail. Your are able to change your password after logging in.",
-'CHARSET'=>"CHARSET",
+'CHARSET'=>"UTF-8",
'MENU_TITLE_SEARCH_CONTENT'=>"MENU_TITLE_SEARCH_CONTENT",
'MENU_TITLE_SEARCH_PROP'=>"MENU_TITLE_SEARCH_PROP",
'MENU_START'=>"Start",
diff --git a/modules/language/lang-de.php b/modules/language/lang-de.php
@@ -560,7 +560,7 @@ function language() { return array(
'MAIL_SUBJECT_PASSWORD_NEW'=>"Neues Kennwort",
'MAIL_SUBJECT_REGISTER_COMMIT_CODE'=>"Ihr Registrierungscode",
'MAIL_SUBJECT_USER_MAIL'=>"Ihre Zugangsdaten",
-'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Guten Tag {name},;;Mit dem nachfolgenden Code können Sie Ihre E-Mail-Adresse ändern:;;Code: {code};;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein.",
+'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Guten Tag {name},;;Sie erhalten diese E-Mail, weil Sie eine Änderung Ihrer E-Mail-Adresse wünschen.;;Mit dem nachfolgenden Code können Sie Ihre E-Mail-Adresse ändern:;;Code: {code};;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein.;;Wenn Sie nicht wissen, wieso Sie diese E-Mail erhalten haben, ignorieren Sie diese bitte.",
'MAIL_TEXT_PASSWORD_COMMIT_CODE'=>"Guten Tag {name},;;Ihr Code zum Anfordern eines neuen Kennwortes lautet: {code}.;;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein;;Sollten Sie kein neues Kennwort angefordert haben, so ignorieren Sie bitte diese E-Mail.;;Vielen Dank.",
'MAIL_TEXT_PASSWORD_NEW'=>"Guten Tag {name},;;Ihr neues Kennwort lautet: {password};;Bitte notieren Sie sich dieses gut und löschen Sie anschließend diese E-Mail.;;Vielen Dank.",
'MAIL_TEXT_REGISTER_COMMIT_CODE'=>"Guten Tag,;;Sie oder jemand anderes möchte sich für die Nutzung des OpenRat-CMS registrieren, hiermit erhalten Sie den notwendigen Registrierungscode.;;Ihr Registrierungs-Code: {code};;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein.;;Falls Sie diese Registrierung nicht durchgeführt haben, so ignorieren Sie bitte diese E-Mail.;;Vielen Dank für Ihr Interesse.",
@@ -1254,7 +1254,7 @@ function language() { return array(
'USER_MAIL_SUBJECT'=>"Your Password",
'USER_MAIL_TEXT_PREFIX'=>"Your Password for logging in to OpenRat Content Management System is:",
'USER_MAIL_TEXT_SUFFIX'=>"Note this password at a secure place and remove this E-Mail. Your are able to change your password after logging in.",
-'CHARSET'=>"CHARSET",
+'CHARSET'=>"UTF-8",
'MENU_TITLE_SEARCH_CONTENT'=>"MENU_TITLE_SEARCH_CONTENT",
'MENU_TITLE_SEARCH_PROP'=>"Suche nach Eigenschaft",
'MENU_START'=>"Start",
diff --git a/modules/language/lang-en.php b/modules/language/lang-en.php
@@ -560,7 +560,7 @@ function language() { return array(
'MAIL_SUBJECT_PASSWORD_NEW'=>"New password",
'MAIL_SUBJECT_REGISTER_COMMIT_CODE'=>"Your registration code",
'MAIL_SUBJECT_USER_MAIL'=>"Your password",
-'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;Enter the following code to verify your e-Mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
+'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;you are receiving this mail, because you want to change your e-mail-adresse.;;Enter the following code to verify your e-mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
'MAIL_TEXT_PASSWORD_COMMIT_CODE'=>"Hello {name};;your code for requesting a new password is: {code};;Please insert this number into the input field.;;If you have not request a new password, please ignore this e-mail. In this case, your password will stay unchanged.;;Thank you.",
'MAIL_TEXT_PASSWORD_NEW'=>"Hello {name};;your new password: {password};;Please note this password at a secure place and delete this mail.;;Thank you.",
'MAIL_TEXT_REGISTER_COMMIT_CODE'=>"Hello,;;you (or another person) has requested a registration code.;;Your registration code: {code}.;;Please insert this number into the input field.;;Thank you.",
@@ -1254,7 +1254,7 @@ function language() { return array(
'USER_MAIL_SUBJECT'=>"Your Password",
'USER_MAIL_TEXT_PREFIX'=>"Your Password for logging in to OpenRat Content Management System is:",
'USER_MAIL_TEXT_SUFFIX'=>"Note this password at a secure place and remove this E-Mail. Your are able to change your password after logging in.",
-'CHARSET'=>"CHARSET",
+'CHARSET'=>"UTF-8",
'MENU_TITLE_SEARCH_CONTENT'=>"MENU_TITLE_SEARCH_CONTENT",
'MENU_TITLE_SEARCH_PROP'=>"MENU_TITLE_SEARCH_PROP",
'MENU_START'=>"Start",
diff --git a/modules/language/lang-es.php b/modules/language/lang-es.php
@@ -560,7 +560,7 @@ function language() { return array(
'MAIL_SUBJECT_PASSWORD_NEW'=>"Nouveau mot de passe",
'MAIL_SUBJECT_REGISTER_COMMIT_CODE'=>"Votre code d'enregistrement",
'MAIL_SUBJECT_USER_MAIL'=>"Votre mot de passe",
-'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;Enter the following code to verify your e-Mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
+'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;you are receiving this mail, because you want to change your e-mail-adresse.;;Enter the following code to verify your e-mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
'MAIL_TEXT_PASSWORD_COMMIT_CODE'=>"Bonjour {name},;;votre code pour demander un nouveau mot de passe est : {code};;Veuillez insérer ce nombre dans le champ d'entrée.;;Si vous n'avez pas la demande un nouveau mot de passe, ignorer svp cet E-mail. Dans ce cas-ci, votre mot de passe restera sans changement. ; ; Merci.",
'MAIL_TEXT_PASSWORD_NEW'=>"Hola {name};;tu nueva contraseña: {password};;Observar por favor esta contraseña en un lugar seguro y suprimir este correo.;;Gracias.",
'MAIL_TEXT_REGISTER_COMMIT_CODE'=>"Hola,;;tú (u otra persona) has solicitado un código del registro.;;Tu código del registro: {code}.;;Insertar por favor este número en el campo de la entrada.;;Gracias.",
@@ -1278,7 +1278,7 @@ MENU_INDEX_ADMINISTRATION_DESC =",
'USER_MAIL_SUBJECT'=>"tu contraseña",
'USER_MAIL_TEXT_PREFIX'=>"tu contraseña para entrar a OpenRat que es el sistema de gerencia contento:",
'USER_MAIL_TEXT_SUFFIX'=>"Observar esta contraseña en un lugar seguro y quitar este E-mail. Tu poder cambiar tu contraseña después de entrar.",
-'CHARSET'=>"ISO-8859-1",
+'CHARSET'=>"UTF-8",
'MENU_TITLE_SEARCH_CONTENT'=>"Search for value",
'MENU_TITLE_SEARCH_PROP'=>"Search for property",
'MENU_START'=>"Start",
diff --git a/modules/language/lang-fr.php b/modules/language/lang-fr.php
@@ -560,7 +560,7 @@ function language() { return array(
'MAIL_SUBJECT_PASSWORD_NEW'=>"Nouveau mot de passe",
'MAIL_SUBJECT_REGISTER_COMMIT_CODE'=>"Votre code d'enregistrement",
'MAIL_SUBJECT_USER_MAIL'=>"Votre mot de passe",
-'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;Enter the following code to verify your e-Mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
+'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;you are receiving this mail, because you want to change your e-mail-adresse.;;Enter the following code to verify your e-mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
'MAIL_TEXT_PASSWORD_COMMIT_CODE'=>"Bonjour {name};;votre code pour demander un nouveau mot de passe est : {code} ; ; Veuillez insérer ce nombre dans le champ d'entrée. ; ; Si vous n'avez pas la demande un nouveau mot de passe, ignorer svp cet E-mail. Dans ce cas-ci, votre mot de passe restera sans changement. ; ; Merci.",
'MAIL_TEXT_PASSWORD_NEW'=>"Bonjour {name};;votre nouveau mot de passe : {password};;Veuillez noter ce mot de passe à un endroit bloqué et supprimer ce courrier.;; Merci.",
'MAIL_TEXT_REGISTER_COMMIT_CODE'=>"Bonjour,;; toi (ou une personne différente) a demandé un code d'enregistrement. ; ; Votre code d'enregistrement : {code}. ; ; Veuillez insérer ce nombre dans le champ d'entrée. ; ; Merci.",
@@ -1254,7 +1254,7 @@ function language() { return array(
'USER_MAIL_SUBJECT'=>"Votre mot de passe",
'USER_MAIL_TEXT_PREFIX'=>"Votre mot de passe pour entrer au système de gestion content d'OpenRat est :",
'USER_MAIL_TEXT_SUFFIX'=>"Noter ce mot de passe à un endroit bloqué et enlever cet E-mail. Votre pouvoir changer votre mot de passe après avoir entré.",
-'CHARSET'=>"ISO-8859-1",
+'CHARSET'=>"UTF-8",
'MENU_TITLE_SEARCH_CONTENT'=>"Search for value",
'MENU_TITLE_SEARCH_PROP'=>"Search for property",
'MENU_START'=>"Start",
diff --git a/modules/language/lang-it.php b/modules/language/lang-it.php
@@ -560,7 +560,7 @@ function language() { return array(
'MAIL_SUBJECT_PASSWORD_NEW'=>"New password",
'MAIL_SUBJECT_REGISTER_COMMIT_CODE'=>"tu código del registro",
'MAIL_SUBJECT_USER_MAIL'=>"tu contraseña",
-'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;Enter the following code to verify your e-Mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
+'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;you are receiving this mail, because you want to change your e-mail-adresse.;;Enter the following code to verify your e-mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
'MAIL_TEXT_PASSWORD_COMMIT_CODE'=>"hola {name}; ; tu código para solicitar una nueva contraseña es: {code}; ; Insertar por favor este número en el campo de la entrada. ; ; Si no tienes petición una nueva contraseña, no hacer caso por favor de este E-mail. En este caso, tu contraseña permanecerá sin cambiar. ; ; Gracias.",
'MAIL_TEXT_PASSWORD_NEW'=>"Hola {name}; ; tu nueva contraseña: {password}; ; Observar por favor esta contraseña en un lugar seguro y suprimir este correo. ; ; Gracias.",
'MAIL_TEXT_REGISTER_COMMIT_CODE'=>"Hola,;; tú (u otra persona) has solicitado un código del registro. ; ; Tu código del registro: {code}. ; ; Insertar por favor este número en el campo de la entrada. ; ; Gracias.",
@@ -1254,7 +1254,7 @@ function language() { return array(
'USER_MAIL_SUBJECT'=>"la vostra parola d'accesso",
'USER_MAIL_TEXT_PREFIX'=>"la vostra parola d'accesso per entrare a OpenRat ch'il sistema di amministrazione soddisfatto è:",
'USER_MAIL_TEXT_SUFFIX'=>"Notare questa parola d'accesso ad un posto sicuro e rimuovere questo E-mail. Vostro potere cambiare la vostra parola d'accesso dopo avere entrato.",
-'CHARSET'=>"ISO-8859-1",
+'CHARSET'=>"UTF-8",
'MENU_TITLE_SEARCH_CONTENT'=>"Search for value",
'MENU_TITLE_SEARCH_PROP'=>"Search for property",
'MENU_START'=>"Start",
diff --git a/modules/language/lang-ru.php b/modules/language/lang-ru.php
@@ -560,7 +560,7 @@ function language() { return array(
'MAIL_SUBJECT_PASSWORD_NEW'=>"Новый пароль",
'MAIL_SUBJECT_REGISTER_COMMIT_CODE'=>"Ваш регистрационный код",
'MAIL_SUBJECT_USER_MAIL'=>"Пароль",
-'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;Enter the following code to verify your e-Mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
+'MAIL_TEXT_MAIL_CHANGE_CODE'=>"Hello {name},;;you are receiving this mail, because you want to change your e-mail-adresse.;;Enter the following code to verify your e-mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.",
'MAIL_TEXT_PASSWORD_COMMIT_CODE'=>"название Hello {name};;Ваш код для отправки запроса на получение нового пароля : {code};;Введите это число в поле ввода.;;Если Вы еще не запрашивал новый пароль, пожалуйста, игнорируйте эту электронную почту. В этом случае Ваш пароль будет оставаться неизменным.;;Спасибо.",
'MAIL_TEXT_PASSWORD_NEW'=>"Привет именем {name};;Ваш новый пароль : {password};;Обратите внимание, этот пароль на безопасное место и удалить это сообщение.;;Спасибо.",
'MAIL_TEXT_REGISTER_COMMIT_CODE'=>"Здравствуйте,;;Ваше имя (или другое лицо) обратилось регистрационного кода.;;Ваш регистрационный код : {code}.;;Введите это число в поле ввода.;;Спасибо.",
diff --git a/modules/language/language.yml b/modules/language/language.yml
@@ -2862,8 +2862,8 @@ MAIL_SUBJECT_USER_MAIL:
it: tu contraseña
ru: Пароль
MAIL_TEXT_MAIL_CHANGE_CODE:
- de: 'Guten Tag {name},;;Mit dem nachfolgenden Code können Sie Ihre E-Mail-Adresse ändern:;;Code: {code};;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein.'
- en: 'Hello {name},;;Enter the following code to verify your e-Mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.'
+ de: 'Guten Tag {name},;;Sie erhalten diese E-Mail, weil Sie eine Änderung Ihrer E-Mail-Adresse wünschen.;;Mit dem nachfolgenden Code können Sie Ihre E-Mail-Adresse ändern:;;Code: {code};;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein.;;Wenn Sie nicht wissen, wieso Sie diese E-Mail erhalten haben, ignorieren Sie diese bitte.'
+ en: 'Hello {name},;;you are receiving this mail, because you want to change your e-mail-adresse.;;Enter the following code to verify your e-mail-adress:;;Code: {code};;Please copy this number an paste it into the input field.;;if you do not know where this mail comes from, please ignore it.'
MAIL_TEXT_PASSWORD_COMMIT_CODE:
de: 'Guten Tag {name},;;Ihr Code zum Anfordern eines neuen Kennwortes lautet: {code}.;;Bitte kopieren Sie diese Zahl und fügen Sie diese in das entsprechende Eingabefeld ein;;Sollten Sie kein neues Kennwort angefordert haben, so ignorieren Sie bitte diese E-Mail.;;Vielen Dank.'
en: 'Hello {name};;your code for requesting a new password is: {code};;Please insert this number into the input field.;;If you have not request a new password, please ignore this e-mail. In this case, your password will stay unchanged.;;Thank you.'
@@ -6046,10 +6046,7 @@ USER_MAIL_TEXT_SUFFIX:
it: "Notare questa parola d'accesso ad un posto sicuro e rimuovere questo E-mail. Vostro potere cambiare la vostra parola d'accesso dopo avere entrato."
ru: Примечание пароль на этом безопасном месте и удалить это письмо. Ваш сможете изменить пароль после регистрации. Членства
CHARSET:
- es: ISO-8859-1
- fr: ISO-8859-1
- it: ISO-8859-1
- ru: UTF-8
+ en: UTF-8
MENU_TITLE_SEARCH_CONTENT:
es: Search for value
fr: Search for value