diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 11f0694a..3d755abf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -51,7 +51,7 @@ class ApplicationController < ActionController::Base def user_not_authorized render json: { - error: t('backend.errors.unauthorized') + error: t('errors.unauthorized') }, status: :unauthorized end end diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 8796e69f..8763481d 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -70,7 +70,7 @@ class BoardsController < ApplicationController render json: workflow_output else render json: { - error: t("backend.errors.board.update_order") + error: t("errors.board.update_order") }, status: :unprocessable_entity end end diff --git a/app/controllers/post_statuses_controller.rb b/app/controllers/post_statuses_controller.rb index 7a027c38..1fd342ca 100644 --- a/app/controllers/post_statuses_controller.rb +++ b/app/controllers/post_statuses_controller.rb @@ -66,7 +66,7 @@ class PostStatusesController < ApplicationController render json: workflow_output else render json: { - error: t("backend.errors.post_status.update_order") + error: t("errors.post_status.update_order") }, status: :unprocessable_entity end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 62912b1a..18b0d32d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,7 +1,7 @@ module ApplicationHelper def check_user_signed_in unless user_signed_in? - flash[:alert] = t('backend.errors.not_logged_in') + flash[:alert] = t('errors.not_logged_in') redirect_to new_user_session_path return false @@ -12,7 +12,7 @@ module ApplicationHelper return if check_user_signed_in == false unless current_user.admin? - flash[:alert] = t('backend.errors.not_enough_privileges') + flash[:alert] = t('errors.not_enough_privileges') redirect_to root_path return end @@ -22,7 +22,7 @@ module ApplicationHelper return if check_user_signed_in == false unless current_user.admin? or current_user.moderator? - flash[:alert] = t('backend.errors.not_enough_privileges') + flash[:alert] = t('errors.not_enough_privileges') redirect_to root_path return end diff --git a/app/models/user.rb b/app/models/user.rb index 72528a83..4c9a8b76 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -37,7 +37,7 @@ class User < ApplicationRecord end def inactive_message - active? ? super : :blocked_or_deleted + active? ? super : I18n.t('errors.user_blocked_or_deleted') end # Override Devise::Confirmable#after_confirmation diff --git a/config/locales/activerecord/activerecord.de.yml b/config/locales/activerecord/activerecord.de.yml deleted file mode 100644 index 13d5f602..00000000 --- a/config/locales/activerecord/activerecord.de.yml +++ /dev/null @@ -1,43 +0,0 @@ -de: - activerecord: - attributes: - board: - name: 'Name' - description: 'Beschreibung' - order: 'Sortierung' - comment: - body: 'Body' - is_post_update: 'Beitragsdatum' - user_id: 'Autor' - post_id: 'Beitrag' - parent_id: 'Übergeordneter Kommentar' - follow: - user_id: 'Benutzer' - post_id: 'Beitrag' - like: - user_id: 'Benutzer' - post_id: 'Beitrag' - post_status: - name: 'Name' - color: 'Farbe' - order: 'Sortierung' - show_in_roadmap: 'In Roadmap anzeigen' - post: - title: 'Titel' - description: 'Beschreibung' - board_id: 'Board posten' - user_id: 'Beitragsautor' - post_status_id: 'Beitragsstatus' - user: - email: 'E-Mail' - full_name: 'Vor- und Nachname' - role: 'Rolle' - notifications_enabled: 'Benachrichtigungen aktiviert' - errors: - messages: - invalid: 'ist gültig' - required: 'ist obligatorisch' - blank: 'darf nicht leer sein' - taken: 'wird bereits verwendet' - too_short: 'ist zu kurz (mindestens %{count} Zeichen)' - too_long: 'ist zu lang (maximal ${count} Zeichen)' diff --git a/config/locales/activerecord/activerecord.en.yml b/config/locales/activerecord/activerecord.en.yml deleted file mode 100644 index fea18469..00000000 --- a/config/locales/activerecord/activerecord.en.yml +++ /dev/null @@ -1,43 +0,0 @@ -it: - activerecord: - attributes: - board: - name: 'Name' - description: 'Description' - order: 'Order' - comment: - body: 'Body' - is_post_update: 'Post update' - user_id: 'Author' - post_id: 'Post' - parent_id: 'Parent comment' - follow: - user_id: 'User' - post_id: 'Post' - like: - user_id: 'User' - post_id: 'Post' - post_status: - name: 'Name' - color: 'Color' - order: 'Order' - show_in_roadmap: 'Show in roadmap' - post: - title: 'Title' - description: 'Description' - board_id: 'Post board' - user_id: 'Post author' - post_status_id: 'Post status' - user: - email: 'Email' - full_name: 'Name and surname' - role: 'Role' - notifications_enabled: 'Notifications enabled' - errors: - messages: - invalid: 'is invalid' - required: 'is mandatory' - blank: 'cannot be blank' - taken: 'is already in use' - too_short: 'is too short (minimum %{count} characters)' - too_long: 'is too long (maximum ${count} characters)' \ No newline at end of file diff --git a/config/locales/activerecord/activerecord.it.yml b/config/locales/activerecord/activerecord.it.yml deleted file mode 100644 index 37d27c59..00000000 --- a/config/locales/activerecord/activerecord.it.yml +++ /dev/null @@ -1,43 +0,0 @@ -it: - activerecord: - attributes: - board: - name: 'Nome' - description: 'Descrizione' - order: 'Ordine' - comment: - body: 'Corpo' - is_post_update: 'Aggiornamento post' - user_id: 'Autore' - post_id: 'Post' - parent_id: 'Commento padre' - follow: - user_id: 'Utente' - post_id: 'Post' - like: - user_id: 'Utente' - post_id: 'Post' - post_status: - name: 'Nome' - color: 'Colore' - order: 'Ordine' - show_in_roadmap: 'Mostra nella roadmap' - post: - title: 'Titolo' - description: 'Descrizione' - board_id: 'Bacheca del post' - user_id: 'Autore del post' - post_status_id: 'Stato del post' - user: - email: 'E-mail' - full_name: 'Nome e cognome' - role: 'Ruolo' - notifications_enabled: 'Notifiche abilitate' - errors: - messages: - invalid: 'è invalido' - required: 'è obbligatorio' - blank: 'non può essere vuoto' - taken: 'è già in uso' - too_short: 'è troppo corto (almeno %{count} caratteri)' - too_long: 'è troppo lungo (massimo ${count} caratteri)' diff --git a/config/locales/backend/backend.de.yml b/config/locales/backend/backend.de.yml new file mode 100644 index 00000000..4d8650ef --- /dev/null +++ b/config/locales/backend/backend.de.yml @@ -0,0 +1,86 @@ +de: + errors: + unauthorized: 'Du bist nicht autorisiert' + not_logged_in: 'Du musst angemeldet sein, um auf diese Seite zugreifen zu können' + not_enough_privileges: 'Du hast nicht die Berechtigung, auf diese Seite zuzugreifen' + user_blocked_or_deleted: 'Du kannst nicht auf Dein Konto zugreifen, da es gesperrt oder gelöscht wurde.' + board: + update_order: 'Beim Neuordnen der Boards ist ein Fehler aufgetreten' + post_status: + update_order: 'Beim Neuordnen des Status ist ein Fehler aufgetreten' + mailers: + devise: + welcome_greeting: 'Willkommen auf %{site_name}, %{email}!' + opening_greeting: 'Hallo %{email}!' + confirmation_instructions: + body: 'Du kannst Deine Konto-E-Mail über den folgenden Link bestätigen:' + action: 'Mein Konto bestätigen' + email_changed: + body: "Wir kontaktieren Dich, um Dich darüber zu informieren, dass Deine E-Mail-Adresse in %{email} geändert wird." + body2: "Wir kontaktieren Dich, um Dich darüber zu informieren, dass Deine E-Mail-Adresse in %{email} geändert wurde." + password_change: + body: "Wir kontaktieren Dich, um Dich darüber zu informieren, dass Dein Passwort geändert wurde." + reset_password: + body: 'Jemand hat einen Link angefordert, um Dein Passwort zu ändern. Du kannst dies über den unten stehenden Link tun.' + body2: "Wenn Du dies nicht angefordert hast, ignoriere diese E-Mail bitte." + body3: "Dein Passwort ändert sich erst, wenn Du auf den obigen Link zugreifst und ein neues erstellst." + action: 'Mein Passwort ändern' + user: + opening_greeting: 'Hallo!' + closing_greeting: 'Habe einen schönen Tag!' + learn_more: 'Klick hier um mehr zu erfahren' + unsubscribe: 'Verärgert? Du kannst Benachrichtigungen hier deaktivieren' + notify_post_owner: + subject: '[%{app_name}] Neuer Kommentar zu %{post}' + body: 'Es existiert ein neuer Kommentar von %{user} zu Deinem Beitrag %{post}' + notify_comment_owner: + subject: '[%{app_name}] Neue Antwort auf Deinen Kommentar von %{post}' + body: 'Es existiert eine neue Antwort von %{user} auf Deinem Kommentar von Beitrag %{post}' + notify_followers_of_post_update: + subject: '[%{app_name}] Neues Update für Beitrag %{post}' + body: "Es existiert ein neues Update für den Beitrag, dem Du folgst %{post}" + notify_followers_of_post_status_change: + subject: '[%{app_name}] Statusänderung bei Beitrag %{post}' + body: "Der Beitrag, dem Du folgst %{post} hat einen neuen Status" + activerecord: + attributes: + board: + name: 'Name' + description: 'Beschreibung' + order: 'Sortierung' + comment: + body: 'Body' + is_post_update: 'Beitragsdatum' + user_id: 'Autor' + post_id: 'Beitrag' + parent_id: 'Übergeordneter Kommentar' + follow: + user_id: 'Benutzer' + post_id: 'Beitrag' + like: + user_id: 'Benutzer' + post_id: 'Beitrag' + post_status: + name: 'Name' + color: 'Farbe' + order: 'Sortierung' + show_in_roadmap: 'In Roadmap anzeigen' + post: + title: 'Titel' + description: 'Beschreibung' + board_id: 'Board posten' + user_id: 'Beitragsautor' + post_status_id: 'Beitragsstatus' + user: + email: 'E-Mail' + full_name: 'Vor- und Nachname' + role: 'Rolle' + notifications_enabled: 'Benachrichtigungen aktiviert' + errors: + messages: + invalid: 'ist gültig' + required: 'ist obligatorisch' + blank: 'darf nicht leer sein' + taken: 'wird bereits verwendet' + too_short: 'ist zu kurz (mindestens %{count} Zeichen)' + too_long: 'ist zu lang (maximal ${count} Zeichen)' \ No newline at end of file diff --git a/config/locales/backend/backend.en.yml b/config/locales/backend/backend.en.yml new file mode 100644 index 00000000..24ea5371 --- /dev/null +++ b/config/locales/backend/backend.en.yml @@ -0,0 +1,86 @@ +en: + errors: + unauthorized: 'You are not authorized' + not_logged_in: 'You must be logged in to access this page' + not_enough_privileges: 'You do not have the privilegies to access this page' + user_blocked_or_deleted: 'You cannot access your account because it has been blocked or deleted.' + board: + update_order: 'There was an error in reordering boards' + post_status: + update_order: 'There was an error in reordering statuses' + mailers: + devise: + welcome_greeting: 'Welcome to %{site_name}, %{email}!' + opening_greeting: 'Hello %{email}!' + confirmation_instructions: + body: 'You can confirm your account email through the link below:' + action: 'Confirm my account' + email_changed: + body: "We're contacting you to notify you that your email is being changed to %{email}." + body2: "We're contacting you to notify you that your email has been changed to %{email}." + password_change: + body: "We're contacting you to notify you that your password has been changed." + reset_password: + body: 'Someone has requested a link to change your password. You can do this through the link below.' + body2: "If you didn't request this, please ignore this email." + body3: "Your password won't change until you access the link above and create a new one." + action: 'Change my password' + user: + opening_greeting: 'Hello!' + closing_greeting: 'Have a great day!' + learn_more: 'Click here to learn more' + unsubscribe: 'Annoyed? You can turn off notifications here' + notify_post_owner: + subject: '[%{app_name}] New comment on %{post}' + body: 'There is a new comment by %{user} on your post %{post}' + notify_comment_owner: + subject: '[%{app_name}] New reply on your comment from %{post}' + body: 'There is a new reply by %{user} on your comment from post %{post}' + notify_followers_of_post_update: + subject: '[%{app_name}] New update for post %{post}' + body: "There is a new update on the post you're following %{post}" + notify_followers_of_post_status_change: + subject: '[%{app_name}] Status change on post %{post}' + body: "The post you're following %{post} has a new status" + activerecord: + attributes: + board: + name: 'Name' + description: 'Description' + order: 'Order' + comment: + body: 'Body' + is_post_update: 'Post update' + user_id: 'Author' + post_id: 'Post' + parent_id: 'Parent comment' + follow: + user_id: 'User' + post_id: 'Post' + like: + user_id: 'User' + post_id: 'Post' + post_status: + name: 'Name' + color: 'Color' + order: 'Order' + show_in_roadmap: 'Show in roadmap' + post: + title: 'Title' + description: 'Description' + board_id: 'Post board' + user_id: 'Post author' + post_status_id: 'Post status' + user: + email: 'Email' + full_name: 'Name and surname' + role: 'Role' + notifications_enabled: 'Notifications enabled' + errors: + messages: + invalid: 'is invalid' + required: 'is mandatory' + blank: 'cannot be blank' + taken: 'is already in use' + too_short: 'is too short (minimum %{count} characters)' + too_long: 'is too long (maximum ${count} characters)' \ No newline at end of file diff --git a/config/locales/activerecord/activerecord.es.yml b/config/locales/backend/backend.es.yml similarity index 100% rename from config/locales/activerecord/activerecord.es.yml rename to config/locales/backend/backend.es.yml diff --git a/config/locales/activerecord/activerecord.fr.yml b/config/locales/backend/backend.fr.yml similarity index 100% rename from config/locales/activerecord/activerecord.fr.yml rename to config/locales/backend/backend.fr.yml diff --git a/config/locales/backend/backend.it.yml b/config/locales/backend/backend.it.yml new file mode 100644 index 00000000..888d5d44 --- /dev/null +++ b/config/locales/backend/backend.it.yml @@ -0,0 +1,86 @@ +it: + errors: + unauthorized: 'Non sei autorizzato' + not_logged_in: 'Devi effettuare l''accesso per visualizzare questa pagina' + not_enough_privileges: 'Non hai i privilegi necessari per visualizzare questa pagina' + user_blocked_or_deleted: 'Non puoi accedere al tuo account perché è stato bloccato o eliminato.' + board: + update_order: 'Si è verificato un errore durante il riordinamento delle bacheche' + post_status: + update_order: 'Si è verificato un errore durante il riordinamento degli stati' + mailers: + devise: + welcome_greeting: 'Benvenuto su %{site_name}, %{email}!' + opening_greeting: 'Ciao %{email}!' + confirmation_instructions: + body: 'Puoi confermare il tuo account cliccando il link qua sotto:' + action: 'Conferma il mio account' + email_changed: + body: "Ti contattiamo per segnalarti che la tua email sta per essere modificata in %{email}." + body2: "Ti contattiamo per segnalarti che la tua email è stata modificata in %{email}." + password_change: + body: "Ti contattiamo per segnalarti che la tua password è stata modificata." + reset_password: + body: 'Qualcuno ha richiesto un link per modificare la tua password. Puoi modificare la tua password cliccando sul link qua sotto.' + body2: "Se non sei stato tu a richiedere la modifica, ti preghiamo di ignorare questa email." + body3: "La tua password non sarà modificata finché non cliccherai sul link qua sopra e ne creerai una nuova." + action: 'Cambia la mia password' + user: + opening_greeting: 'Ciao!' + closing_greeting: 'Buona giornata!' + learn_more: 'Clicca qui per saperne di più' + unsubscribe: 'Non vuoi più ricevere notifiche? Clicca qui' + notify_post_owner: + subject: '[%{app_name}] Nuovo commento al tuo post %{post}' + body: '%{user} ha commentato il tuo post %{post}' + notify_comment_owner: + subject: '[%{app_name}] Risposta al tuo commento nel post %{post}' + body: '%{user} ha risposto al tuo commento nel post %{post}' + notify_followers_of_post_update: + subject: '[%{app_name}] Nuovo aggiornamento per il post %{post}' + body: "C'è un nuovo aggiornamento sul post che stai seguendo %{post}" + notify_followers_of_post_status_change: + subject: '[%{app_name}] Aggiornamento stato per il post %{post}' + body: "Il post che segui %{post} ha un nuovo stato" + activerecord: + attributes: + board: + name: 'Nome' + description: 'Descrizione' + order: 'Ordine' + comment: + body: 'Corpo' + is_post_update: 'Aggiornamento post' + user_id: 'Autore' + post_id: 'Post' + parent_id: 'Commento padre' + follow: + user_id: 'Utente' + post_id: 'Post' + like: + user_id: 'Utente' + post_id: 'Post' + post_status: + name: 'Nome' + color: 'Colore' + order: 'Ordine' + show_in_roadmap: 'Mostra nella roadmap' + post: + title: 'Titolo' + description: 'Descrizione' + board_id: 'Bacheca del post' + user_id: 'Autore del post' + post_status_id: 'Stato del post' + user: + email: 'E-mail' + full_name: 'Nome e cognome' + role: 'Ruolo' + notifications_enabled: 'Notifiche abilitate' + errors: + messages: + invalid: 'è invalido' + required: 'è obbligatorio' + blank: 'non può essere vuoto' + taken: 'è già in uso' + too_short: 'è troppo corto (almeno %{count} caratteri)' + too_long: 'è troppo lungo (massimo ${count} caratteri)' \ No newline at end of file diff --git a/config/locales/activerecord/activerecord.ja.yml b/config/locales/backend/backend.ja.yml similarity index 100% rename from config/locales/activerecord/activerecord.ja.yml rename to config/locales/backend/backend.ja.yml diff --git a/config/locales/activerecord/activerecord.ko.yml b/config/locales/backend/backend.ko.yml similarity index 100% rename from config/locales/activerecord/activerecord.ko.yml rename to config/locales/backend/backend.ko.yml diff --git a/config/locales/activerecord/activerecord.nl.yml b/config/locales/backend/backend.nl.yml similarity index 100% rename from config/locales/activerecord/activerecord.nl.yml rename to config/locales/backend/backend.nl.yml diff --git a/config/locales/activerecord/activerecord.pt.yml b/config/locales/backend/backend.pt.yml similarity index 100% rename from config/locales/activerecord/activerecord.pt.yml rename to config/locales/backend/backend.pt.yml diff --git a/config/locales/activerecord/activerecord.ru.yml b/config/locales/backend/backend.ru.yml similarity index 100% rename from config/locales/activerecord/activerecord.ru.yml rename to config/locales/backend/backend.ru.yml diff --git a/config/locales/activerecord/activerecord.zh.yml b/config/locales/backend/backend.zh.yml similarity index 100% rename from config/locales/activerecord/activerecord.zh.yml rename to config/locales/backend/backend.zh.yml diff --git a/config/locales/de.yml b/config/locales/de.yml index 5d0bb764..0436d5bf 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -182,47 +182,4 @@ de: role_admin: 'Administrator' status_active: 'Aktiv' status_blocked: 'Gesperrt' - status_deleted: 'Gelöscht' - mailers: - devise: - welcome_greeting: 'Willkommen auf %{site_name}, %{email}!' - opening_greeting: 'Hallo %{email}!' - confirmation_instructions: - body: 'Du kannst Deine Konto-E-Mail über den folgenden Link bestätigen:' - action: 'Mein Konto bestätigen' - email_changed: - body: "Wir kontaktieren Dich, um Dich darüber zu informieren, dass Deine E-Mail-Adresse in %{email} geändert wird." - body2: "Wir kontaktieren Dich, um Dich darüber zu informieren, dass Deine E-Mail-Adresse in %{email} geändert wurde." - password_change: - body: "Wir kontaktieren Dich, um Dich darüber zu informieren, dass Dein Passwort geändert wurde." - reset_password: - body: 'Jemand hat einen Link angefordert, um Dein Passwort zu ändern. Du kannst dies über den unten stehenden Link tun.' - body2: "Wenn Du dies nicht angefordert hast, ignoriere diese E-Mail bitte." - body3: "Dein Passwort ändert sich erst, wenn Du auf den obigen Link zugreifst und ein neues erstellst." - action: 'Mein Passwort ändern' - user: - opening_greeting: 'Hallo!' - closing_greeting: 'Habe einen schönen Tag!' - learn_more: 'Klick hier um mehr zu erfahren' - unsubscribe: 'Verärgert? Du kannst Benachrichtigungen hier deaktivieren' - notify_post_owner: - subject: '[%{app_name}] Neuer Kommentar zu %{post}' - body: 'Es existiert ein neuer Kommentar von %{user} zu Deinem Beitrag %{post}' - notify_comment_owner: - subject: '[%{app_name}] Neue Antwort auf Deinen Kommentar von %{post}' - body: 'Es existiert eine neue Antwort von %{user} auf Deinem Kommentar von Beitrag %{post}' - notify_followers_of_post_update: - subject: '[%{app_name}] Neues Update für Beitrag %{post}' - body: "Es existiert ein neues Update für den Beitrag, dem Du folgst %{post}" - notify_followers_of_post_status_change: - subject: '[%{app_name}] Statusänderung bei Beitrag %{post}' - body: "Der Beitrag, dem Du folgst %{post} hat einen neuen Status" - backend: - errors: - unauthorized: 'Du bist nicht autorisiert' - not_logged_in: 'Du musst angemeldet sein, um auf diese Seite zugreifen zu können' - not_enough_privileges: 'Du hast nicht die Berechtigung, auf diese Seite zuzugreifen' - board: - update_order: 'Beim Neuordnen der Boards ist ein Fehler aufgetreten' - post_status: - update_order: 'Beim Neuordnen des Status ist ein Fehler aufgetreten' + status_deleted: 'Gelöscht' \ No newline at end of file diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml index 58618d22..71dd0fcd 100644 --- a/config/locales/devise/devise.de.yml +++ b/config/locales/devise/devise.de.yml @@ -1,4 +1,3 @@ -#Additional translations at https://github.com/plataformatec/devise/wiki/I18n de: devise: confirmations: @@ -15,7 +14,6 @@ de: timeout: "Deine Sitzung ist abgelaufen, bitte melde Dich erneut an." unauthenticated: "Du musst Dich anmelden oder registrieren, bevor Du fortfahren kannst." unconfirmed: "Du musst Dein Konto bestätigen, bevor Du fortfahren kannst." - blocked_or_deleted: "Du kannst nicht auf Dein Konto zugreifen, da es gesperrt oder gelöscht wurde." mailer: confirmation_instructions: subject: "Anleitung zur Bestätigung Deines Kontos" @@ -62,4 +60,4 @@ de: not_locked: "ist nicht gesperrt" not_saved: one: "%{resource} konnte aufgrund eines Fehlers nicht gespeichert werden:" - other: "%{count} Fehler verhinderten das Speichern von %{resource}:" + other: "%{count} Fehler verhinderten das Speichern von %{resource}:" \ No newline at end of file diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml index 2ad113f5..3d5dc33e 100644 --- a/config/locales/devise/devise.en.yml +++ b/config/locales/devise/devise.en.yml @@ -1,5 +1,3 @@ -# Additional translations at https://github.com/plataformatec/devise/wiki/I18n - en: devise: confirmations: @@ -16,7 +14,6 @@ en: timeout: "Your session expired. Please sign in again to continue." unauthenticated: "You need to sign in or sign up before continuing." unconfirmed: "You have to confirm your email address before continuing." - blocked_or_deleted: "You cannot access your account because it has been blocked or deleted." mailer: confirmation_instructions: subject: "Confirmation instructions" @@ -63,4 +60,4 @@ en: not_locked: "was not locked" not_saved: one: "1 error prohibited this %{resource} from being saved:" - other: "%{count} errors prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" \ No newline at end of file diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml index 50992f52..c74cbcda 100644 --- a/config/locales/devise/devise.it.yml +++ b/config/locales/devise/devise.it.yml @@ -1,4 +1,3 @@ -#Additional translations at https://github.com/plataformatec/devise/wiki/I18n it: devise: confirmations: @@ -15,7 +14,6 @@ it: timeout: "La tua sessione è scaduta, accedi nuovamente per continuare." unauthenticated: "Devi accedere o registrarti per continuare." unconfirmed: "Devi confermare il tuo indirizzo email per continuare." - blocked_or_deleted: "Non puoi accedere al tuo account perché è stato bloccato o eliminato." mailer: confirmation_instructions: subject: "Istruzioni per la conferma" @@ -62,4 +60,4 @@ it: not_locked: "non era bloccato" not_saved: one: "Un errore ha impedito di salvare questo %{resource}:" - other: "%{count} errori hanno impedito di salvare questo %{resource}:" + other: "%{count} errori hanno impedito di salvare questo %{resource}:" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 9f5baf1b..b5315d1a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -182,47 +182,4 @@ en: role_admin: 'Administrator' status_active: 'Active' status_blocked: 'Blocked' - status_deleted: 'Deleted' - mailers: - devise: - welcome_greeting: 'Welcome to %{site_name}, %{email}!' - opening_greeting: 'Hello %{email}!' - confirmation_instructions: - body: 'You can confirm your account email through the link below:' - action: 'Confirm my account' - email_changed: - body: "We're contacting you to notify you that your email is being changed to %{email}." - body2: "We're contacting you to notify you that your email has been changed to %{email}." - password_change: - body: "We're contacting you to notify you that your password has been changed." - reset_password: - body: 'Someone has requested a link to change your password. You can do this through the link below.' - body2: "If you didn't request this, please ignore this email." - body3: "Your password won't change until you access the link above and create a new one." - action: 'Change my password' - user: - opening_greeting: 'Hello!' - closing_greeting: 'Have a great day!' - learn_more: 'Click here to learn more' - unsubscribe: 'Annoyed? You can turn off notifications here' - notify_post_owner: - subject: '[%{app_name}] New comment on %{post}' - body: 'There is a new comment by %{user} on your post %{post}' - notify_comment_owner: - subject: '[%{app_name}] New reply on your comment from %{post}' - body: 'There is a new reply by %{user} on your comment from post %{post}' - notify_followers_of_post_update: - subject: '[%{app_name}] New update for post %{post}' - body: "There is a new update on the post you're following %{post}" - notify_followers_of_post_status_change: - subject: '[%{app_name}] Status change on post %{post}' - body: "The post you're following %{post} has a new status" - backend: - errors: - unauthorized: 'You are not authorized' - not_logged_in: 'You must be logged in to access this page' - not_enough_privileges: 'You do not have the privilegies to access this page' - board: - update_order: 'There was an error in reordering boards' - post_status: - update_order: 'There was an error in reordering statuses' \ No newline at end of file + status_deleted: 'Deleted' \ No newline at end of file diff --git a/config/locales/it.yml b/config/locales/it.yml index 3ed90ead..03ffc299 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -182,47 +182,4 @@ it: role_admin: 'Amministratore' status_active: 'Attivo' status_blocked: 'Bloccato' - status_deleted: 'Eliminato' - mailers: - devise: - welcome_greeting: 'Benvenuto su %{site_name}, %{email}!' - opening_greeting: 'Ciao %{email}!' - confirmation_instructions: - body: 'Puoi confermare il tuo account cliccando il link qua sotto:' - action: 'Conferma il mio account' - email_changed: - body: "Ti contattiamo per segnalarti che la tua email sta per essere modificata in %{email}." - body2: "Ti contattiamo per segnalarti che la tua email è stata modificata in %{email}." - password_change: - body: "Ti contattiamo per segnalarti che la tua password è stata modificata." - reset_password: - body: 'Qualcuno ha richiesto un link per modificare la tua password. Puoi modificare la tua password cliccando sul link qua sotto.' - body2: "Se non sei stato tu a richiedere la modifica, ti preghiamo di ignorare questa email." - body3: "La tua password non sarà modificata finché non cliccherai sul link qua sopra e ne creerai una nuova." - action: 'Cambia la mia password' - user: - opening_greeting: 'Ciao!' - closing_greeting: 'Buona giornata!' - learn_more: 'Clicca qui per saperne di più' - unsubscribe: 'Non vuoi più ricevere notifiche? Clicca qui' - notify_post_owner: - subject: '[%{app_name}] Nuovo commento al tuo post %{post}' - body: '%{user} ha commentato il tuo post %{post}' - notify_comment_owner: - subject: '[%{app_name}] Risposta al tuo commento nel post %{post}' - body: '%{user} ha risposto al tuo commento nel post %{post}' - notify_followers_of_post_update: - subject: '[%{app_name}] Nuovo aggiornamento per il post %{post}' - body: "C'è un nuovo aggiornamento sul post che stai seguendo %{post}" - notify_followers_of_post_status_change: - subject: '[%{app_name}] Aggiornamento stato per il post %{post}' - body: "Il post che segui %{post} ha un nuovo stato" - backend: - errors: - unauthorized: 'Non sei autorizzato' - not_logged_in: 'Devi effettuare l''accesso per visualizzare questa pagina' - not_enough_privileges: 'Non hai i privilegi necessari per visualizzare questa pagina' - board: - update_order: 'Si è verificato un errore durante il riordinamento delle bacheche' - post_status: - update_order: 'Si è verificato un errore durante il riordinamento degli stati' + status_deleted: 'Eliminato' \ No newline at end of file diff --git a/crowdin.yml b/crowdin.yml index ac8bf950..15d49cbd 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,13 +1,8 @@ "project_id": "527056" -"preserve_hierarchy": true "files": [ { "source": "/config/locales/en.yml", - "ignore": [ - "/config/locales/activerecord", - "/config/locales/devise" - ], "translation": "/config/locales/%two_letters_code%.yml" }, { @@ -15,7 +10,7 @@ "translation": "/config/locales/devise/devise.%two_letters_code%.yml" }, { - "source": "/config/locales/activerecord/activerecord.en.yml", - "translation": "/config/locales/activerecord/activerecord.%two_letters_code%.yml" + "source": "/config/locales/backend/backend.en.yml", + "translation": "/config/locales/backend/backend.%two_letters_code%.yml" } ] \ No newline at end of file