diff --git a/app/controllers/admin/blog/posts_controller.rb b/app/controllers/admin/blog/posts_controller.rb index a0a2d86..5311cb2 100644 --- a/app/controllers/admin/blog/posts_controller.rb +++ b/app/controllers/admin/blog/posts_controller.rb @@ -19,7 +19,7 @@ def create respond_to do |format| if @post.save - format.html { redirect_to @post, notice: t('admin.blog_post.creation-succes') } + format.html { redirect_to @post, notice: t('admin.blog_post.creation_success') } else format.html { render :new } end @@ -33,7 +33,7 @@ def edit def update @post = Blog::Post.friendly.find(params[:id]) if @post.update(post_params) - redirect_to @post, notice: t('admin.blog_post.update-succes') + redirect_to @post, notice: t('admin.blog_post.update_success') else render :edit end @@ -42,7 +42,7 @@ def update def destroy @post = Blog::Post.friendly.find(params[:id]) @post.destroy - redirect_to admin_blog_posts_url, notice: t('admin.blog_posts.deletion-success') + redirect_to admin_blog_posts_url, notice: t('admin.blog_post.deletion_success') end private diff --git a/app/views/admin/appointments/_table.html.haml b/app/views/admin/appointments/_table.html.haml index 8b910be..523700c 100644 --- a/app/views/admin/appointments/_table.html.haml +++ b/app/views/admin/appointments/_table.html.haml @@ -22,9 +22,9 @@ %td= appointment.notice %td= appointment.link %td= appointment.info - %td= link_to t('Show'), [:admin, appointment] - %td= link_to t('Edit'), edit_admin_appointment_path(appointment) - %td= link_to t('Destroy'), [:admin, appointment], method: :delete, data: { confirm: 'Are you sure?' } + %td= link_to t('actions.show'), [:admin, appointment] + %td= link_to t('actions.edit'), edit_admin_appointment_path(appointment) + %td= link_to t('actions.Destroy'), [:admin, appointment], method: :delete, data: { confirm: 'Are you sure?' } %br diff --git a/app/views/admin/blog/posts/index.html.haml b/app/views/admin/blog/posts/index.html.haml index 94017dd..45a6a10 100644 --- a/app/views/admin/blog/posts/index.html.haml +++ b/app/views/admin/blog/posts/index.html.haml @@ -51,9 +51,9 @@ = l(post.published_at) %td.post-actions .buttons - = link_to t('Show'), post, class: 'button is-small' - = link_to t('Edit'), edit_admin_blog_post_path(post), class: 'button is-small' - = link_to t('Destroy'), [:admin, post], method: :delete, data: { confirm: t('Are you sure?') }, class: 'button is-small is-danger' + = link_to t('actions.Show'), post, class: 'button is-small' + = link_to t('actions.Edit'), edit_admin_blog_post_path(post), class: 'button is-small' + = link_to t('actions.Destroy'), [:admin, post], method: :delete, data: { confirm: t('Are you sure?') }, class: 'button is-small is-danger' %br diff --git a/app/views/admin/course/lessons/index.html.haml b/app/views/admin/course/lessons/index.html.haml index bd56bd6..81a94fe 100644 --- a/app/views/admin/course/lessons/index.html.haml +++ b/app/views/admin/course/lessons/index.html.haml @@ -28,11 +28,11 @@ = t('lesson.inactive') %td .buttons - = link_to t('Show'), [:admin, lesson.style, lesson] + = link_to t('actions.show'), [:admin, lesson.style, lesson] %td - = link_to t('Edit'), edit_admin_style_lesson_path(lesson.style, lesson) + = link_to t('actions.dit'), edit_admin_style_lesson_path(lesson.style, lesson) %td - = link_to t('Destroy'), [:admin, lesson.style, lesson], method: :delete, data: { confirm: t('are_you_sure?') } + = link_to t('actions.Destroy'), [:admin, lesson.style, lesson], method: :delete, data: { confirm: t('are_you_sure?') } %br diff --git a/app/views/admin/courses/edit.html.haml b/app/views/admin/courses/edit.html.haml index 3c4f0e9..08a6696 100644 --- a/app/views/admin/courses/edit.html.haml +++ b/app/views/admin/courses/edit.html.haml @@ -7,6 +7,6 @@ = render 'form' -= link_to t('Show'), [:admin, @course] += link_to t('admin.course.show'), [:admin, @course] \| = link_to ('Back'), admin_courses_path diff --git a/app/views/admin/courses/index.html.haml b/app/views/admin/courses/index.html.haml index f5e2611..1fe4b19 100644 --- a/app/views/admin/courses/index.html.haml +++ b/app/views/admin/courses/index.html.haml @@ -78,10 +78,10 @@ = course.note %td .buttons - = link_to t('Show'), [:admin, course], class: 'button is-small' - = link_to t('Edit'), edit_admin_course_path(course), class: 'button is-small' + = link_to t('actions.show'), [:admin, course], class: 'button is-small' + = link_to t('actions.edit'), edit_admin_course_path(course), class: 'button is-small' - if !course.active? - = link_to t('Destroy'), [:admin, course], method: :delete, + = link_to t('actions.Destroy'), [:admin, course], method: :delete, data: { confirm: t('Are you sure?') }, class: 'button is-small is-danger' diff --git a/app/views/admin/places/_table.html.haml b/app/views/admin/places/_table.html.haml index ab32509..ab35ce6 100644 --- a/app/views/admin/places/_table.html.haml +++ b/app/views/admin/places/_table.html.haml @@ -5,11 +5,11 @@ %table.table.is-fullwidth %thead %tr - %th= t('Name') - %th= t('Building Name') - %th= t('Note') - %th= t('PricingNote') - %th= t('Address') + %th= Place.human_attribute_name :name + %th= Place.human_attribute_name :building_name + %th= Place.human_attribute_name :note + %th= Place.human_attribute_name :pricing_note + %th= Place.human_attribute_name :address %th %th %th @@ -22,9 +22,9 @@ %td= place.note %td= place.pricing_note %td= place.address - %td= link_to t('Show'), [:admin, place] - %td= link_to t('Edit'), edit_admin_place_path(place) - %td= link_to t('Destroy'), [:admin, place], method: :delete, data: { confirm: 'Are you sure?' } + %td= link_to t('actions.show'), [:admin, place] + %td= link_to t('actions.edit'), edit_admin_place_path(place) + %td= link_to t('actions.Destroy'), [:admin, place], method: :delete, data: { confirm: 'Are you sure?' } %br diff --git a/app/views/admin/places/new.html.haml b/app/views/admin/places/new.html.haml index 170324e..9125eed 100644 --- a/app/views/admin/places/new.html.haml +++ b/app/views/admin/places/new.html.haml @@ -7,4 +7,4 @@ = render 'form' -= link_to 'Back', admin_places_path += link_to t('Back'), admin_places_path diff --git a/app/views/admin/places/show.html.haml b/app/views/admin/places/show.html.haml index fe4ee2c..ee850f1 100644 --- a/app/views/admin/places/show.html.haml +++ b/app/views/admin/places/show.html.haml @@ -7,18 +7,18 @@ %p %b - = t('place.name') + = Place.human_attribute_name :name \: = @place.name %p - %b=t('building_name') + %b= Place.human_attribute_name :building_name = @place.building_name %p - %b Note + %b= Place.human_attribute_name :note = @place.note -= link_to t('Add course'), new_admin_course_path(params: {course: { place_id: @place.id}}) += link_to t('admin.places.add_course'), new_admin_course_path(params: {course: { place_id: @place.id}}) -= link_to t('Edit'), edit_admin_place_path(@place) += link_to t('actions.edit'), edit_admin_place_path(@place) \| -= link_to t('Back'), admin_places_path += link_to t('actions.Back'), admin_places_path diff --git a/app/views/admin/site_settings/_settings_table.html.haml b/app/views/admin/site_settings/_settings_table.html.haml index b657e9c..eb48938 100644 --- a/app/views/admin/site_settings/_settings_table.html.haml +++ b/app/views/admin/site_settings/_settings_table.html.haml @@ -1,8 +1,8 @@ %table.table.is-striped.is-fullwidth %thead %tr - %th= t('Key') - %th= t('Value') + %th= t('admin.site_settings.table.key') + %th= t('admin.site_settings.table.value') %th %th diff --git a/app/views/admin/site_settings/edit.html.haml b/app/views/admin/site_settings/edit.html.haml index 27d7eb7..d917ac9 100644 --- a/app/views/admin/site_settings/edit.html.haml +++ b/app/views/admin/site_settings/edit.html.haml @@ -11,4 +11,8 @@ = render 'form' -= link_to 'Back', admin_site_settings_path +%br.is-clearfix += link_to admin_site_settings_path, class: 'has-text-danger' do + %span.icon + %i.fa.fa-arrow-left + = t('actions.Back') diff --git a/app/views/admin/site_settings/index.html.haml b/app/views/admin/site_settings/index.html.haml index 99d35e5..cde873b 100644 --- a/app/views/admin/site_settings/index.html.haml +++ b/app/views/admin/site_settings/index.html.haml @@ -2,8 +2,8 @@ -# -# SPDX-License-Identifier: AGPL-3.0-or-later -%h1.title - = t('Listing site_settings') +%h1.title.mb-6 + = t('.listing') %h2.subtitle.is-4 = t('site_settings.general') diff --git a/app/views/admin/styles/edit.html.haml b/app/views/admin/styles/edit.html.haml index 65160ca..8a4e882 100644 --- a/app/views/admin/styles/edit.html.haml +++ b/app/views/admin/styles/edit.html.haml @@ -7,6 +7,6 @@ = render 'form' -= link_to t('Show'), @course += link_to t('actions.Show'), @course \| -= link_to ('Back'), admin_courses_path += link_to ('actions.Back'), admin_courses_path diff --git a/app/views/admin/styles/index.html.haml b/app/views/admin/styles/index.html.haml index 42c34f8..5c3d2c1 100644 --- a/app/views/admin/styles/index.html.haml +++ b/app/views/admin/styles/index.html.haml @@ -73,10 +73,10 @@ -# = style.appointments.future.first&.date_from %td .buttons - = link_to t('Show'), style, class: 'button is-small' - = link_to t('Edit'), edit_admin_style_path(style), class: 'button is-small' + = link_to t('actions.show'), style, class: 'button is-small' + = link_to t('actions.edit'), edit_admin_style_path(style), class: 'button is-small' - if !style.active? - = link_to t('Destroy'), [:admin, style], method: :delete, + = link_to t('actions.Destroy'), [:admin, style], method: :delete, data: { confirm: t('Are you sure?') }, class: 'button is-small is-danger' diff --git a/app/views/blog/posts/_hero_head.html.haml b/app/views/blog/posts/_hero_head.html.haml index cc8c937..fa8f375 100644 --- a/app/views/blog/posts/_hero_head.html.haml +++ b/app/views/blog/posts/_hero_head.html.haml @@ -21,5 +21,5 @@ %span.icon %i.fas.fa-user-shield %span - = t('post.edit') + = t('actions.edit') diff --git a/app/views/courses/index.html.haml b/app/views/courses/index.html.haml index b1accad..920444a 100644 --- a/app/views/courses/index.html.haml +++ b/app/views/courses/index.html.haml @@ -17,5 +17,5 @@ .card-content = course.name -#Text - %td= link_to t('Show'), course + %td= link_to t('actions.show'), course diff --git a/app/views/styles/index.html.haml b/app/views/styles/index.html.haml index 1a9ca15..bdd2a3e 100644 --- a/app/views/styles/index.html.haml +++ b/app/views/styles/index.html.haml @@ -17,5 +17,5 @@ .card-content = style.name Text - %td= link_to t('Show'), style + %td= link_to t('actions.show'), style diff --git a/app/views/styles/show.html.haml b/app/views/styles/show.html.haml index 77bf50c..f2ce414 100644 --- a/app/views/styles/show.html.haml +++ b/app/views/styles/show.html.haml @@ -47,12 +47,12 @@ %span.icon.is-small %i.fas.fa-user-shield %span - = t('styles.new-video') + = t('admin.styles.new-video') = link_to edit_admin_style_path(@style), class: 'button is-link is-outlined' do %span.icon.is-small %i.fas.fa-user-shield %span - = t('style.admin.edit') + = t('actions.edit') - if @style.description.present? %blockquote diff --git a/config/locales/actions.de.yml b/config/locales/actions.de.yml index 400d663..0353f0a 100644 --- a/config/locales/actions.de.yml +++ b/config/locales/actions.de.yml @@ -7,7 +7,11 @@ de: Back: Zurück delete: löschen Delete: Löschen + destroy: löschen Destroy: Löschen edit: bearbeiten Edit: Bearbeiten + save: speichern + Save: Speichern + show: anzeigen Show: Anzeigen diff --git a/config/locales/admin.de.yml b/config/locales/admin.de.yml new file mode 100644 index 0000000..75e54d1 --- /dev/null +++ b/config/locales/admin.de.yml @@ -0,0 +1,23 @@ +# SPDX-FileCopyrightText: 2020 Felix Wolfsteller +# +# SPDX-License-Identifier: AGPL-3.0-or-later +--- +de: + admin: + site_settings: + index: + listing: Alle Seiten-Einstellungen + table: + key: Einstellung + value: Wert + blog: + post: + new: Neuer Post + blog_post: + creation_success: Blog Post erstellt. + update_success: Post aktualisiert. + deletion_success: Post gelöscht. + places: + add_course: Kurs hinzufügen + styles: + new-video: Neues Video diff --git a/config/locales/de.yml b/config/locales/de.yml index eb8c757..f02b1ec 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -26,8 +26,6 @@ de: edit: Bearbeiten info: Info title: Title - blog_post: - creation_success: Blog Post erstellt. course: lessons: create: @@ -252,20 +250,33 @@ de: already-registered?: Bereits registriert? appointment: new: Neuen Termin eintragen + contact: + title: Über uns / Kontakt + send-a-message: Schreibe uns courses: + about-all-courses: Wissenswertes über die Kurse + all-courses-title: Alle Kurse auf einen Blick courses-title: Kurse new: Neuen anlegen none_yet: Noch keine Kurse + styles: Yoga-Stile + subtitle: Etabliere Deine regelmäßige Yoga-Praxis intro: learn_more: Mehr erfahren ... + latest-blog-post: "Letzer Blog-Eintrag:" + news: "News:" next_appointments: Die nächsten Termine no_appointments: Da die normalen Yoga-Kurse wieder stattfinden können, gibt es zur Zeit keine Zoom-Termine. register-for-trial-period: Für Schnupperwoche registrieren sign-in-with-account: Mit bestehenden Zugangsdaten anmelden + styles: + courses: Kurse trial-period: Schnupperwoche user: days_till_end_of_trial: Days till end of trial - videos: Videos + videos: + title: Videos + subtitle: Praktiziere wo Du willst, wann Du willst welcome: Willkommen in: in in_future: Zukünftig @@ -293,16 +304,20 @@ de: admin: Admin appointments: Termine background-jobs: Background Jobs + contact: Kontakt courses: Kurse emails: E-Mails pages: impressum: Impressum privacy_statement: Datenschutzhinweise terms: AGB + programs: Programme + seminars: Seminare site_settings: Seiten-Einstellungen user: settings: Einstellungen users: User + videos: Videos new_lesson: Neue Lektion next_appointment: Nächster Termin next_appointments: Die nächsten Termine @@ -326,65 +341,6 @@ de: site: title: Einstellung sign_out: Abmelden - site_settings: - ":": ":" - about_us: - default: "# Über uns" - help: Über-Uns-Seite - copyright_notice: - default: Copyright () - help: Copyright-Hinweise im Footer - explanation: - default: Details über Dein Business (markdown) - help: Sichtbar bei Mehr erfahren-Link - general: Allgemein - home-page: Home-page - favicon: - default: Favicon in .ico Format - help: Favicon in .ico Format (e.g. 48x48 px), braucht Server-Neustart! - favicon-png: - default: Favicon in .png Format - help: Favicon in .png Format (32x32 px), braucht Server-Neustart! - favicon-apple-touch: - default: Apple Touch image (png) - help: Favicon für apple-touch (180x180 px), braucht Server-Neustart! - impressum: - default: Dein Impressum (markdown) - help: Impressum im Footer - intro: - default: Hallo von Deiner frischen**YoSis** Installation! - help: Intro Text auf Start-Seite - intro_background: - default: "(Bild)" - help: Hintergrund-Bild vom Intro-Block auf Startseite - logo: - default: Default - help: Lade Dein Logo hoch - news_line: - default: No news is good news! - help: Die News-Zeile auf der landing page. - payment_details: - default: "(bitte nachfragen)" - help: Werden bei "reminder" E-Mails (vor Ablauf der Schnupperwoche oder Abonnement) erwähnt. - privacy_statement: - default: Deine Datenschutzbestimmung (markdown) - help: Datenschutzerklärung im Footer - register_cta: - default: Für 25€/Monat erhälst du einen regulären Zugang ("Abonement", verlängert sich nicht automatisch). - help: Bereits-Registriert-Info-Box-Text auf Start-Seite. - sub-pages: Unter-Seiten - terms: - default: AGB - help: Die AGBs (Allgemeinen Geschäftsbedingungen) deiner Seite - title: - default: Yosis - help: Der Titel Deiner Seite - trial_period_cta: - default: Du kannst Dich für eine kostenlose Schnupperwoche registrieren. Damit erhälst du Zugang zu allen Zoom-Terminen in den nächsten 7 Tagen sowie zu zwei Videos aus jedem Kurs. Es entsteht daraus keine weitere Verpflichtung. - help: Schnupperwochen-Info-Box-Text auf Start-Seite. - your_name: - default: Yosis - help: Dein Name sitesetting: edit: Edit subscription: diff --git a/config/locales/models.de.yml b/config/locales/models.de.yml index 0d15a9e..11553c9 100644 --- a/config/locales/models.de.yml +++ b/config/locales/models.de.yml @@ -33,6 +33,14 @@ de: user: read_privacy_terms: Stimme AGB zu tos_agreement: Datenschutzhinweise gelesen + site_setting: + value: Wert + place: + building_name: Gebäude-Name + name: Name + note: Hinweis + pricing_note: Hinweis zu Kosten + address: Adresse models: appointment: labels: diff --git a/config/locales/site_settings.de.yml b/config/locales/site_settings.de.yml index 1dd3a77..550cd62 100644 --- a/config/locales/site_settings.de.yml +++ b/config/locales/site_settings.de.yml @@ -38,7 +38,7 @@ de: default: "(Bild)" help: Hintergrund-Bild vom Intro-Block auf Startseite logo: - default: Default + default: Seiten-Logo (wird zB im Menü angezeigt) help: Lade Dein Logo hoch news_line: default: No news is good news!