From 723d2c4600d2b8c9aabc9a26562553a02616f65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=BDach?= <45913977+marek-lach@users.noreply.github.com> Date: Tue, 2 Apr 2019 15:08:07 +0200 Subject: [PATCH] Grammar corrections followup to #510 (#512) A very small commit, but let's do all the string corrections while I am already at it :-) Wraps up #510 --- plume-front/src/editor.rs | 4 ++-- po/plume/ar.po | 12 +++++++++--- po/plume/de.po | 9 +++++---- po/plume/en.po | 8 ++++---- po/plume/es.po | 11 ++++++++--- po/plume/fr.po | 9 +++++---- po/plume/gl.po | 9 +++++---- po/plume/it.po | 9 +++++---- po/plume/ja.po | 11 ++++++++--- po/plume/nb.po | 10 +++++++--- po/plume/pl.po | 12 +++++++++--- po/plume/plume.pot | 6 +++--- po/plume/pt.po | 12 +++++++++--- po/plume/ru.po | 9 +++++---- src/mail.rs | 2 +- src/main.rs | 4 ++-- src/routes/session.rs | 2 +- templates/instance/about.rs.html | 2 +- templates/session/login.rs.html | 8 ++++---- 19 files changed, 93 insertions(+), 56 deletions(-) diff --git a/plume-front/src/editor.rs b/plume-front/src/editor.rs index eef77683..160d4c65 100644 --- a/plume-front/src/editor.rs +++ b/plume-front/src/editor.rs @@ -108,7 +108,7 @@ pub fn init() -> Result<(), EditorError> { let subtitle = init_widget( &ed, "h2", - i18n!(CATALOG, "Subtitle or summary"), + i18n!(CATALOG, "Subtitle, or summary"), subtitle_val, true, )?; @@ -269,7 +269,7 @@ fn make_editable(tag: &'static str) -> Element { .create_element(tag) .expect("Couldn't create editable element"); elt.set_attribute("contenteditable", "true") - .expect("Couldn't make element editable"); + .expect("Couldn't make the element editable"); elt } diff --git a/po/plume/ar.po b/po/plume/ar.po index 748131b1..0ac98122 100644 --- a/po/plume/ar.po +++ b/po/plume/ar.po @@ -240,7 +240,8 @@ msgstr "يستضيف {0} مستخدمين" msgid "Who wrote {0} articles" msgstr "قاموا بتحرير {0} مقالات" -msgid "And connected to {0} other instances" +#, fuzzy +msgid "And are connected to {0} other instances" msgstr "ومتصل بـ {0} مثيلات خوادم أخرى" msgid "Administred by" @@ -556,10 +557,12 @@ msgstr "البريد الالكتروني" msgid "Send password reset link" msgstr "كلمة السر" -msgid "Login" +#, fuzzy +msgid "Log in" msgstr "تسجيل الدخول" -msgid "Username or email" +#, fuzzy +msgid "Username, or email" msgstr "اسم المستخدم أو عنوان البريد الالكتروني" msgid "Publish" @@ -835,6 +838,9 @@ msgstr "قم بنسخه و إلصاقه في محتوى مقالك لعرض ال msgid "Use as an avatar" msgstr "استخدمها كصورة رمزية" +#~ msgid "Login" +#~ msgstr "تسجيل الدخول" + #~ msgid "You need to be logged in order to create a new blog" #~ msgstr "يجب عليك تسجيل الدخول قصد انشاء مدونة جديدة" diff --git a/po/plume/de.po b/po/plume/de.po index f85de790..25e660f0 100644 --- a/po/plume/de.po +++ b/po/plume/de.po @@ -244,7 +244,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -560,11 +560,12 @@ msgstr "E-Mail" msgid "Send password reset link" msgstr "Passwort" -msgid "Login" -msgstr "" +#, fuzzy +msgid "Log in" +msgstr "Einloggen" #, fuzzy -msgid "Username or email" +msgid "Username, or email" msgstr "Nutzername oder E-Mail" msgid "Publish" diff --git a/po/plume/en.po b/po/plume/en.po index c074c02a..797e402c 100644 --- a/po/plume/en.po +++ b/po/plume/en.po @@ -238,7 +238,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -532,11 +532,11 @@ msgstr "" msgid "Send password reset link" msgstr "" -msgid "Login" +msgid "Log in" msgstr "" -# src/template_utils.rs:144 -msgid "Username or email" +# src/template_utils.rs:217 +msgid "Username, or email" msgstr "" msgid "Publish" diff --git a/po/plume/es.po b/po/plume/es.po index d719a54e..39339fb8 100644 --- a/po/plume/es.po +++ b/po/plume/es.po @@ -233,7 +233,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -528,10 +528,12 @@ msgstr "Correo electrónico" msgid "Send password reset link" msgstr "Contraseña" -msgid "Login" +#, fuzzy +msgid "Log in" msgstr "Iniciar Sesión" -msgid "Username or email" +#, fuzzy +msgid "Username, or email" msgstr "Nombre de usuario o correo electrónico" msgid "Publish" @@ -777,6 +779,9 @@ msgstr "" msgid "Use as an avatar" msgstr "" +#~ msgid "Login" +#~ msgstr "Iniciar Sesión" + #~ msgid "You need to be logged in order to create a new blog" #~ msgstr "Necesitas iniciar sesión para crear un nuevo blog" diff --git a/po/plume/fr.po b/po/plume/fr.po index 8f372477..a9bbdc60 100644 --- a/po/plume/fr.po +++ b/po/plume/fr.po @@ -243,7 +243,7 @@ msgid "Who wrote {0} articles" msgstr "Qui ont écrit {0} articles" #, fuzzy -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "Et connecté à {0} autres instances" msgid "Administred by" @@ -556,11 +556,12 @@ msgstr "Adresse électronique" msgid "Send password reset link" msgstr "Mot de passe" -msgid "Login" -msgstr "" +#, fuzzy +msgid "Log in" +msgstr "Se connecter" #, fuzzy -msgid "Username or email" +msgid "Username, or email" msgstr "Nom d’utilisateur ou adresse électronique" msgid "Publish" diff --git a/po/plume/gl.po b/po/plume/gl.po index 3b65473a..b2dfb996 100644 --- a/po/plume/gl.po +++ b/po/plume/gl.po @@ -243,7 +243,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -556,11 +556,12 @@ msgstr "Correo-e" msgid "Send password reset link" msgstr "Contrasinal" -msgid "Login" -msgstr "" +#, fuzzy +msgid "Log in" +msgstr "Conectar" #, fuzzy -msgid "Username or email" +msgid "Username, or email" msgstr "Usuaria ou correo-e" msgid "Publish" diff --git a/po/plume/it.po b/po/plume/it.po index 563048a8..703a94ec 100644 --- a/po/plume/it.po +++ b/po/plume/it.po @@ -243,7 +243,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -559,11 +559,12 @@ msgstr "Email" msgid "Send password reset link" msgstr "Password" -msgid "Login" -msgstr "" +#, fuzzy +msgid "Log in" +msgstr "Accedi" #, fuzzy -msgid "Username or email" +msgid "Username, or email" msgstr "Nome utente o email" msgid "Publish" diff --git a/po/plume/ja.po b/po/plume/ja.po index 79476a4c..1dce9a02 100644 --- a/po/plume/ja.po +++ b/po/plume/ja.po @@ -243,7 +243,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -563,10 +563,12 @@ msgstr "メールアドレス" msgid "Send password reset link" msgstr "パスワード" -msgid "Login" +#, fuzzy +msgid "Log in" msgstr "ログイン" -msgid "Username or email" +#, fuzzy +msgid "Username, or email" msgstr "ユーザー名またはメールアドレス" msgid "Publish" @@ -832,6 +834,9 @@ msgstr "このメディアを記事に挿入するには、自分の記事にコ msgid "Use as an avatar" msgstr "アバターとして使う" +#~ msgid "Login" +#~ msgstr "ログイン" + #~ msgid "You need to be logged in order to create a new blog" #~ msgstr "新しいブログを作成するにはログインする必要があります" diff --git a/po/plume/nb.po b/po/plume/nb.po index 85119412..d338a3f2 100644 --- a/po/plume/nb.po +++ b/po/plume/nb.po @@ -249,7 +249,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" #, fuzzy @@ -583,11 +583,12 @@ msgstr "Epost" msgid "Send password reset link" msgstr "Passord" -msgid "Login" +#, fuzzy +msgid "Log in" msgstr "Logg inn" #, fuzzy -msgid "Username or email" +msgid "Username, or email" msgstr "Brukernavn eller epost" msgid "Publish" @@ -853,6 +854,9 @@ msgstr "" msgid "Use as an avatar" msgstr "" +#~ msgid "Login" +#~ msgstr "Logg inn" + #, fuzzy #~ msgid "You need to be logged in order to create a new blog" #~ msgstr "Du må være logget inn for å lage en ny blogg" diff --git a/po/plume/pl.po b/po/plume/pl.po index 374f9e3f..b06b60d3 100644 --- a/po/plume/pl.po +++ b/po/plume/pl.po @@ -228,7 +228,8 @@ msgstr "Używana przez {0} użytkowników" msgid "Who wrote {0} articles" msgstr "Którzy napisali {0} artykułów" -msgid "And connected to {0} other instances" +#, fuzzy +msgid "And are connected to {0} other instances" msgstr "Połączona z {0} innych instancji" msgid "Administred by" @@ -537,10 +538,12 @@ msgstr "Adres e-mail" msgid "Send password reset link" msgstr "Hasło" -msgid "Login" +#, fuzzy +msgid "Log in" msgstr "Zaloguj się" -msgid "Username or email" +#, fuzzy +msgid "Username, or email" msgstr "Nazwa użytkownika lub adres e-mail" msgid "Publish" @@ -799,6 +802,9 @@ msgstr "Skopiuj do swoich artykułów, aby wstawić tę zawartość multimedialn msgid "Use as an avatar" msgstr "Użyj jako awataru" +#~ msgid "Login" +#~ msgstr "Zaloguj się" + #~ msgid "You need to be logged in order to create a new blog" #~ msgstr "Musisz się zalogować, aby utworzyć bloga" diff --git a/po/plume/plume.pot b/po/plume/plume.pot index 639bb2b8..b31bb688 100644 --- a/po/plume/plume.pot +++ b/po/plume/plume.pot @@ -236,7 +236,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -522,11 +522,11 @@ msgstr "" msgid "Send password reset link" msgstr "" -msgid "Login" +msgid "Log in" msgstr "" # src/template_utils.rs:217 -msgid "Username or email" +msgid "Username, or email" msgstr "" msgid "Publish" diff --git a/po/plume/pt.po b/po/plume/pt.po index b54fcb3c..4101f150 100644 --- a/po/plume/pt.po +++ b/po/plume/pt.po @@ -239,7 +239,8 @@ msgstr "Acolhe {0} pessoas" msgid "Who wrote {0} articles" msgstr "Quem escreveu {0} artigos" -msgid "And connected to {0} other instances" +#, fuzzy +msgid "And are connected to {0} other instances" msgstr "E está conectado a {0} outras instâncias" msgid "Administred by" @@ -556,10 +557,12 @@ msgstr "Email" msgid "Send password reset link" msgstr "Senha" -msgid "Login" +#, fuzzy +msgid "Log in" msgstr "Entrar" -msgid "Username or email" +#, fuzzy +msgid "Username, or email" msgstr "Nome de usuário ou e-mail" msgid "Publish" @@ -820,6 +823,9 @@ msgstr "Copie-o em seus artigos para inserir esta mídia." msgid "Use as an avatar" msgstr "Utilizar como avatar" +#~ msgid "Login" +#~ msgstr "Entrar" + #~ msgid "You need to be logged in order to create a new blog" #~ msgstr "Você precisa estar logado para criar um novo blog" diff --git a/po/plume/ru.po b/po/plume/ru.po index b64cf11f..2c972eae 100644 --- a/po/plume/ru.po +++ b/po/plume/ru.po @@ -248,7 +248,7 @@ msgstr "" msgid "Who wrote {0} articles" msgstr "" -msgid "And connected to {0} other instances" +msgid "And are connected to {0} other instances" msgstr "" msgid "Administred by" @@ -563,11 +563,12 @@ msgstr "Электронная почта" msgid "Send password reset link" msgstr "Пароль" -msgid "Login" -msgstr "" +#, fuzzy +msgid "Log in" +msgstr "Войти" #, fuzzy -msgid "Username or email" +msgid "Username, or email" msgstr "Имя пользователя или адрес электронной почты" msgid "Publish" diff --git a/src/mail.rs b/src/mail.rs index 42e1cebf..1d7c81ee 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -86,7 +86,7 @@ pub fn build_mail(dest: String, subject: String, body: String) -> Option env::var("MAIL_SERVER")? )) as Result<_, env::VarError> }) - .expect("Mail server is not correctly configured"), + .expect("The email server is not configured correctly"), ) .to(dest) .subject(subject) diff --git a/src/main.rs b/src/main.rs index e5dbdca7..393c88f2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -98,8 +98,8 @@ Then try to restart Plume. SearcherError::IndexOpeningError => panic!( r#" Plume was unable to open the search index. If you created the index -before, make sure to run Plume in the directory it was created, or -to set SEARCH_INDEX accordingly. If you did not create the search +before, make sure to run Plume in the same directory it was created in, or +to set SEARCH_INDEX accordingly. If you did not yet create the search index, run this command: plm search init diff --git a/src/routes/session.rs b/src/routes/session.rs index 6b27e588..f547b543 100644 --- a/src/routes/session.rs +++ b/src/routes/session.rs @@ -59,7 +59,7 @@ pub fn create( let user_id = if let Ok(user) = user { if !user.auth(&form.password) { let mut err = ValidationError::new("invalid_login"); - err.message = Some(Cow::from("Invalid username or password")); + err.message = Some(Cow::from("Invalid username, or password")); errors.add("email_or_name", err); String::new() } else { diff --git a/templates/instance/about.rs.html b/templates/instance/about.rs.html index 27166a45..9f6daf50 100644 --- a/templates/instance/about.rs.html +++ b/templates/instance/about.rs.html @@ -19,7 +19,7 @@

@Html(i18n!(ctx.1, "Who wrote {0} articles"; n_articles))

-

@Html(i18n!(ctx.1, "And connected to {0} other instances"; n_instances))

+

@Html(i18n!(ctx.1, "And are connected to {0} other instances"; n_instances))

@i18n!(ctx.1, "Administred by")

diff --git a/templates/session/login.rs.html b/templates/session/login.rs.html index a17b907b..a8448932 100644 --- a/templates/session/login.rs.html +++ b/templates/session/login.rs.html @@ -6,15 +6,15 @@ @(ctx: BaseContext, message: Option, form: &LoginForm, errors: ValidationErrors) -@:base(ctx, i18n!(ctx.1, "Login"), {}, {}, { -

@i18n!(ctx.1, "Login")

+@:base(ctx, i18n!(ctx.1, "Log in"), {}, {}, { +

@i18n!(ctx.1, "Log in")

@if let Some(message) = message {

@message

}
- @input!(ctx.1, email_or_name (text), "Username or email", form, errors.clone(), "minlenght=\"1\"") + @input!(ctx.1, email_or_name (text), "Username, or email", form, errors.clone(), "minlenght=\"1\"") @input!(ctx.1, password (password), "Password", form, errors, "minlenght=\"1\"") - +
Forgot your password? })