From e0db17705a60ba79a6012536e25f6683218354ba Mon Sep 17 00:00:00 2001 From: Felix Wolfsteller Date: Wed, 14 Oct 2020 14:53:10 +0200 Subject: [PATCH] translations (#31) --- .../admin/course/lessons/_form.html.haml | 7 ++++ app/views/admin/course/lessons/edit.html.haml | 2 +- app/views/admin/users/show.html.haml | 12 +++---- app/views/styles/show.html.haml | 4 +-- app/views/terms_acceptances/show.html.haml | 2 +- config/locales/actions.de.yml | 1 + config/locales/admin.de.yml | 22 +++++++++--- config/locales/de.yml | 35 +++++-------------- config/locales/models.de.yml | 3 ++ 9 files changed, 47 insertions(+), 41 deletions(-) diff --git a/app/views/admin/course/lessons/_form.html.haml b/app/views/admin/course/lessons/_form.html.haml index d7708bd..01e0b56 100644 --- a/app/views/admin/course/lessons/_form.html.haml +++ b/app/views/admin/course/lessons/_form.html.haml @@ -12,22 +12,28 @@ %li= message .field + -# i18n-tasks-use t('activerecord.attributes.lesson.name') = f.label :name = f.text_field :name .field + -# i18n-tasks-use t('activerecord.attributes.lesson.description') = f.label :description = f.text_area :description .field + -# i18n-tasks-use t('activerecord.attributes.lesson.date_start') = f.label :date_start = f.datetime_select :date_start .field + -# i18n-tasks-use t('activerecord.attributes.lesson.date_end') = f.label :date_end = f.datetime_select :date_end .field + -# i18n-tasks-use t('activerecord.attributes.lesson.video') = f.label :video = f.file_field :video, direct_upload: true -#= f.hidden_field :video, value: video.signed_id .field + -# i18n-tasks-use t('activerecord.attributes.lesson.preview_image') = f.label :preview_image .media .media-left @@ -38,6 +44,7 @@ .media-content = f.file_field :preview_image .field + -# i18n-tasks-use t('activerecord.attributes.lesson.active') = f.label :active = f.check_box :active .actions diff --git a/app/views/admin/course/lessons/edit.html.haml b/app/views/admin/course/lessons/edit.html.haml index a575a19..2c6df11 100644 --- a/app/views/admin/course/lessons/edit.html.haml +++ b/app/views/admin/course/lessons/edit.html.haml @@ -3,6 +3,6 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later = render layout: 'admin/shared/edit', - locals: { edit_title: t('.edit.title'), + locals: { edit_title: t('.title'), back_target: admin_course_path(@lesson.style) } do = render 'form' diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index b5f36bb..b4766b9 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -47,19 +47,19 @@ %thead %tr %th - = t('user.subscriptions.timespan') + = t('admin.user.subscriptions.timespan') %th - = t('user.subscriptions.notes') + = t('admin.user.subscriptions.notes') %th %tbody - if @user.role == "admin" %tr %td(colspan=2) - = t('user.subsciptions.admins_no_need') + = t('admin.user.subscriptions.admins_no_need') - elsif @user.subscriptions.empty? %tr %td(colspan=2) - = t('user.subscriptions.none') + = t('admin.user.subscriptions.none') - else - @user.subscriptions.each do |subscription| %tr @@ -73,10 +73,10 @@ %td = subscription.notes %td - = link_to t('edit'), + = link_to t('actions.edit'), edit_admin_user_subscription_path(subscription.user, subscription), class: 'button' - = link_to t('delete'), [:admin, subscription.user, subscription], + = link_to t('actions.delete'), [:admin, subscription.user, subscription], method: :delete, data: { confirm: t('actions.are_you_sure?') }, class: 'button' diff --git a/app/views/styles/show.html.haml b/app/views/styles/show.html.haml index fcf1d1a..e86e5f7 100644 --- a/app/views/styles/show.html.haml +++ b/app/views/styles/show.html.haml @@ -71,7 +71,7 @@ - if @style.lessons.active.empty? .box - =t('styles.no_lessons_yet') + =t('styles.no-videos-yet') - first = @style.lessons.active.rank(:row_order).first - last = @style.lessons.active.rank(:row_order).last - access_level = AccessState.new(current_user).level @@ -190,7 +190,7 @@ %span.icon.is-small %i.fas.fa-user-shield %span - =t('styles.edit') + =t('admin.styles.edit') %hr diff --git a/app/views/terms_acceptances/show.html.haml b/app/views/terms_acceptances/show.html.haml index b76b68b..69b58dc 100644 --- a/app/views/terms_acceptances/show.html.haml +++ b/app/views/terms_acceptances/show.html.haml @@ -3,7 +3,7 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later %h1.title - = t('privacy_statement') + = t('.privacy_statement') .container.mb-5 .content.is-medium.has-text-justified != SiteSetting['privacy_statement'] diff --git a/config/locales/actions.de.yml b/config/locales/actions.de.yml index 8372680..5374feb 100644 --- a/config/locales/actions.de.yml +++ b/config/locales/actions.de.yml @@ -10,6 +10,7 @@ de: Save: Speichern Show: Anzeigen are_you_sure?: Bist du dir sicher? + delete: löschen destroy: löschen edit: bearbeiten hide: verbergen diff --git a/config/locales/admin.de.yml b/config/locales/admin.de.yml index bb196f4..3104565 100644 --- a/config/locales/admin.de.yml +++ b/config/locales/admin.de.yml @@ -24,6 +24,10 @@ de: lesson-successfully-created: Video erstellt. destroy: lesson-destroyed: Video gelöscht. + edit: + title: Video bearbeiten + update: + lesson-updated: Video aktualisiert. courses: creation-succes: Kurs erstellt. deletion-success: Kurs gelöscht. @@ -86,8 +90,16 @@ de: new: Neuer Style new-video: Neues Video update-success: Style aktualisiert - admin: - user: - never-signed-in: Noch nie eingeloggt - unconfirmed: unbestätigt - user-heading: User + subscriptions: + total: Gesamt + user: + never-signed-in: Noch nie eingeloggt + subscriptions: + admins_no_need: Admins brauchen kein Abo + none: Keines + notes: Notizen + timespan: Zeitraum + unconfirmed: unbestätigt + user-heading: User + users: + unconfirmed: Unbestätigt diff --git a/config/locales/de.yml b/config/locales/de.yml index 5fc4a50..86cded1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -5,7 +5,6 @@ de: Course: Kurs Courses: Kurse - Customers: Kund*n admin: course: new: Neu @@ -29,11 +28,6 @@ de: sitesetting-successfully-created: Einstellung erstellt. update: site-setting-successfully-updated: Einstellung aktualisiert. - subscriptions: - creation-successfull: Abonnement erstellt. - destroy-success: Abonnement gelöscht. - total: Total - update-successful: Abonnement aktualisiert. user: are-you-sure-to-destroy: "%{email} wirklich löschen?" back_to_admin: Zurück als Admin @@ -123,8 +117,6 @@ de: edit: Bearbeiten listing-heading: Alle Kurse title-all: Alle Kurse - customers: Kund*n - delete: Löschen devise: failure: invited: Du hast noch eine ausstehende Einladung, akzeptiere sie um Dein Konto zu erstellen. @@ -211,6 +203,7 @@ de: ten_days_free: "10 kostenlose Tage" navigation: admin: Admin + asana-lexicon: Asana-Lexikon background-jobs: Background Jobs blog: Blog contact: Kontakt @@ -250,6 +243,11 @@ de: sign_out: Abmelden sitesetting: edit: Edit + styles: + new-video: Neues Video + no-videos-yet: Noch keine Videos + videos: Videos + videos-inactive: Nicht aktive Videos subscription: currently_active: Jetzt aktiv new: Neu @@ -290,33 +288,18 @@ de: your-subscription-ended: Dein Abonnement ist abgelaufen your-trial-ended: Deine Schnupperwoche ist abgelaufen terms_acceptances: - actions: Aktionen create: welcome: Super! Willkommen und viel Spaß! - privacy_statement: Datenschutzerklärung show: acceptance: Zustimmung + actions: Aktionen anonymize: Mein Konto zerstören get_my_data: Zeig mir meine Daten! have_to_agree: Du musst den AGB zustimmen und die Datenschutzerklärung als gelesen markieren. not-happy?: Wenn Du den AGBs nicht zustimmen möchtest oder die Angabe Deiner Daten zu heikel ist, musst Du Dein Konto bei uns leider aufgeben. + privacy_statement: Datenschutzerklärung user: - confirmed_at: Bestätigt am - created_at: Erstellt am - email: E-Mail - in_trial_till: Schnupperphase bis - last_sign_in_at: Zuletzt eingeloggt am - never-signed-in: Noch nie eingeloggt - sign_in_count: Anzahl Anmeldungen - subsciptions: - admins_no_need: Admins brauchen das nicht - subscription_till: Subscription bis - subscriptions: - none: Keine - notes: Notizen - timespan: Zeitraum - unconfirmed: Unbestätigt - user-heading: User + your_data: Deine Daten video: length: Länge minutes: Minuten diff --git a/config/locales/models.de.yml b/config/locales/models.de.yml index b2fcff5..31e318a 100644 --- a/config/locales/models.de.yml +++ b/config/locales/models.de.yml @@ -36,6 +36,8 @@ de: end_time: Endzeit active: Aktiv lesson: + active: Aktiv + course: Kurs date_end: End-Zeit date_start: Start-Zeit description: Beschreibung @@ -51,6 +53,7 @@ de: site_setting: value: Wert user: + id: Datenbank-ID email: E-Mail read_privacy_terms: Stimme AGB zu tos_agreement: Datenschutzhinweise gelesen