Translations, design and content

2017-03-31 14:42:37 +02:00
parent cfc1fbfd9f
commit c3bfeed620
28 changed files with 296 additions and 25 deletions
@@ -39,4 +39,6 @@ Rails.application.configure do

  # Raises error for missing translations
  # config.action_view.raise_on_missing_translations = true
+  config.action_mailer.default_url_options = { host: 'localhost:3000' }
+  config.action_mailer.asset_host = 'http://localhost:3000'
 end
@@ -157,7 +157,7 @@ Devise.setup do |config|

  # ==> Configuration for :validatable
  # Range for password length.
-  config.password_length = 6..128
+  config.password_length = 4..128

  # Email regex used to validate email formats. It simply asserts that
  # one (and only one) @ exists in the given string. This is mainly
@@ -223,7 +223,7 @@ Devise.setup do |config|
  # Turn scoped views on. Before rendering "sessions/new", it will first check for
  # "users/sessions/new". It's turned off by default because it's slower if you
  # are using only default views.
-  # config.scoped_views = false
+  config.scoped_views = true

  # Configure the default scope given to Warden. By default it's the first
  # devise role declared in your routes (usually :user).
@@ -1,11 +1,14 @@
 de:
  shared:
+    "yes": Ja
+    "no": Nein
    header:
      logo: Logo der Initiative
      title_html: Ja, ich will <strong class="text-success">Cannabis</strong> in der Schweiz <strong class="text-success">legalisieren</strong>
    topnavigation:
      donation: Spenden
      sign_in: Anmelden
+      sign_out: Abmelden
    counter:
      supporters: "Unterstützer:"
      amount_of_supporters: Zurzeit haben wir %{amount} Unterstützer.
@@ -26,6 +29,11 @@ de:
    young: Ich bin 18 bis 30 Jahre alt
    middle: Ich bin 30 bis 64 Jahre alt
    retired: Ich bin über 64 Jahre alt
+
+  languages:
+    de: Deutsch
+    fr: Français
+    it: Italiano
    
  supporters:
    form:
@@ -45,13 +53,20 @@ de:
      
    create:
      timeout: Ihre Eingabe war zu schnell.
+    
+    new:
+      title: Hallo %{name}
+      edit: Meine Daten bearbeiten...
+      my_data: Meine Daten
  
  pages:
    thanks:
      title: Besten Dank für deine Unterstützung!

  mongoid:
-   attributes:
+    models:
+      supporter: Konto
+    attributes:
      supporter:
        first_name: Vorname
        last_name: Nachname
@@ -63,3 +78,9 @@ de:
        age_category: Alterskategorie
        li_membership: Ich bin interessiert an einer Mitgliedschaft beim Verein Legalize it! (50 Franken pro Jahr)
        comments: Kommentar / Feedback (optional)
+        remember_me: Angemeldet bleiben
+        password: Passwort
+        language: Sprache
+        unsubscribed: Kein Newsletter
+        password_confirmation: Passwort bestätigen
+        current_password: Aktuelles Passwort
@@ -2,6 +2,8 @@ fr:
  input_error: Vos entrées ne peuvent pas être enregistrées. Vérifiez les entrées.

  shared:
+    "yes": Oui
+    "no": Non
    counter:
      supporters: "Militant:"
      amount_of_supporters: Nous avons actuellement %{amount} supporters.
@@ -10,6 +12,8 @@ fr:
      title_html: Oui, je veux  <strong class="text-success">légaliser le cannabis</strong> en Suisse.
    topnavigation:
      donation: Donation
+      sign_out: déconnecter
+      sign_in: Connexion
      
  welcome_email:
    subject: Merci beaucoup pour ton soutien!
@@ -25,7 +29,12 @@ fr:
    young: J’ai entre 18 et 30 ans
    middle: J’ai entre 30 et 64 ans
    retired: J’ai plus que 64 ans
-    
+ 
+  languages:
+    de: Deutsch
+    fr: Français
+    it: Italiano
+
  supporters:
    form:
      form: Formulaire
@@ -42,13 +51,20 @@ fr:
      
    create:
      timeout: Ihre Eingabe war zu schnell.
-  
+    
+    new:
+      title: Salut %{name}
+      edit: Modifier mes données ...
+      my_data: Mes données
+
  pages:
    thanks:
      title: Merci beaucoup pour ton soutien!
  
  mongoid:
-   attributes:
+    models:
+      supporter: compte
+    attributes:
      supporter:
        first_name: Prénom
        last_name: Nom
@@ -60,3 +76,9 @@ fr:
        age_category: Catégorie d’âge
        li_membership: Je suis intéressé à joindre l'association Legalize It! (50 francs par an).
        comments: Commentaires / Feedback (facultatif)
+        remember_me: Se souvenir de moi
+        password: mot de passe
+        language: Langue
+        unsubscribed: pas de newslettre
+        password_confirmation: confirmer le mot de passe
+        current_password: Mot de passe actuel
@@ -2,11 +2,15 @@ it:
  input_error: I dati immessi non potevano essere salvati. Verificare i dati immessi.

  shared:
+    "yes": Si
+    "No": No
    header:
      logo: Logo dell'iniziativa
      title_html: Si, voglio  <strong class="text-success">legalizzare</strong> la  <strong class="text-success">cannabis in Svizzera</strong>
    topnavigation:
      donation: Donazione
+      sign_out: Disconnettersi
+      sign_in: Registro
    counter:
      supporters: "Sostenitore:"
      amount_of_supporters: Al momento abbiamo %{amount} sostenitori.
@@ -26,6 +30,11 @@ it:
    young: Ho tra 18 e 30 anni
    middle: Ho tra i 30 ed i 64 anni
    retired: Ho più di 64 anni
+  
+  languages:
+    de: Deutsch
+    fr: Français
+    it: Italiano
    
  supporters:
    form:
@@ -44,7 +53,12 @@ it:
      
    create:
      timeout: Ihre Eingabe war zu schnell.
-  
+    
+    new:
+      title: Ciao %{name}
+      edit: Modifica i miei dati ...
+      my_data: Miei dati
+
  pages:
    thanks:
      title: Grazie mille per il tuo sostegno!
@@ -62,3 +76,9 @@ it:
        age_category: Categoria Età 
        li_membership: Sono interessato a diventare membro attivo di Verein Legalize It (50 franchi annuali di tassa).
        comments: Commenti / Feedback (opzionale)
+        remember_me: Ricordati di mel
+        password: Password
+        language: Lingua
+        unsubscribed: No Newsletter
+        password_confirmation: conferma password
+        current_password: Password corrente
@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
  devise_for :supporters
-  root to: redirect("/#{I18n.default_locale}")
+  root to: 'supporters#new' 

  namespace :admin do
    get '/map', to: 'pages#map', as: :map
@@ -12,7 +12,6 @@ Rails.application.routes.draw do
  scope '/:locale' do
    get '/', to: 'supporters#new'
    resources :supporters
-
    get '/thanks', to: 'pages#thanks', as: :thanks
    get '/spenden', to: 'pages#spenden', as: :spenden
    get '/terms_and_conditions', to: 'pages#terms_and_conditions', as: :terms_and_conditions