locomotive_cms 2.0.0.rc11 → 2.0.0.rc12
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +1 -0
- data/app/assets/javascripts/locomotive/utils/tinymce_settings.js.coffee +3 -3
- data/app/assets/javascripts/locomotive/views/content_entries/_popup_form_view.js.coffee +1 -1
- data/app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee +2 -2
- data/app/controllers/locomotive/api/base_controller.rb +4 -4
- data/app/controllers/locomotive/api/memberships_controller.rb +2 -2
- data/app/controllers/locomotive/api/my_account_controller.rb +18 -0
- data/app/controllers/locomotive/api/sites_controller.rb +1 -1
- data/app/controllers/locomotive/current_site_controller.rb +2 -0
- data/app/controllers/locomotive/passwords_controller.rb +6 -0
- data/app/mailers/locomotive/notifications.rb +2 -2
- data/app/models/locomotive/content_entry.rb +13 -1
- data/app/models/locomotive/editable_element.rb +4 -0
- data/app/models/locomotive/extensions/page/editable_elements.rb +7 -4
- data/app/models/locomotive/extensions/page/templatized.rb +14 -0
- data/app/models/locomotive/extensions/page/tree.rb +9 -0
- data/app/models/locomotive/extensions/site/locales.rb +7 -1
- data/app/models/locomotive/page.rb +8 -4
- data/app/presenters/locomotive/content_entry_presenter.rb +4 -4
- data/app/presenters/locomotive/page_presenter.rb +2 -2
- data/app/views/locomotive/current_site/edit.html.haml +3 -0
- data/app/views/locomotive/devise_mailer/reset_password_instructions.html.haml +2 -2
- data/app/views/locomotive/notifications/new_content_entry.html.haml +2 -4
- data/app/views/locomotive/pages/_form.html.haml +4 -0
- data/app/views/locomotive/passwords/edit.html.haml +1 -1
- data/config/locales/admin_ui.de.yml +1 -1
- data/config/locales/admin_ui.en.yml +2 -2
- data/config/locales/admin_ui.es.yml +1 -1
- data/config/locales/admin_ui.et.yml +1 -1
- data/config/locales/admin_ui.fr.yml +3 -3
- data/config/locales/admin_ui.it.yml +1 -1
- data/config/locales/admin_ui.nb.yml +1 -1
- data/config/locales/admin_ui.nl.yml +1 -1
- data/config/locales/admin_ui.pt-BR.yml +1 -1
- data/config/locales/admin_ui.ru.yml +1 -1
- data/config/locales/default.de.yml +2 -1
- data/config/locales/default.fr.yml +6 -3
- data/config/locales/devise.de.yml +11 -11
- data/config/locales/devise.en.yml +1 -1
- data/config/locales/devise.es.yml +9 -9
- data/config/locales/devise.et.yml +1 -1
- data/config/locales/devise.fr.yml +12 -12
- data/config/locales/devise.it.yml +11 -11
- data/config/locales/devise.nb.yml +3 -3
- data/config/locales/devise.nl.yml +10 -10
- data/config/locales/devise.pt-BR.yml +11 -11
- data/config/locales/devise.ru.yml +1 -1
- data/config/locales/flash.fr.yml +1 -1
- data/config/routes.rb +4 -2
- data/lib/generators/locomotive/install/templates/carrierwave.rb +1 -1
- data/lib/locomotive/liquid/tags/editable/base.rb +17 -9
- data/lib/locomotive/middlewares/inline_editor.rb +2 -2
- data/lib/locomotive/routing/site_dispatcher.rb +1 -1
- data/lib/locomotive/version.rb +1 -1
- data/vendor/assets/javascripts/locomotive/datepicker_i18n.js.erb +28 -0
- metadata +9 -11
- data/app/views/locomotive/mailer/confirmation_instructions.html.haml +0 -8
- data/app/views/locomotive/mailer/reset_password_instructions.html.haml +0 -12
- data/app/views/locomotive/mailer/unlock_instructions.html.haml +0 -10
- data/vendor/assets/javascripts/locomotive/datepicker_fr.js +0 -16
@@ -63,8 +63,8 @@ fr:
|
|
63
63
|
|
64
64
|
notifications:
|
65
65
|
new_content_entry:
|
66
|
-
subject: "[%{type}] nouveau"
|
67
|
-
title: "Bonjour %{name}, nous voulions vous faire savoir qu'une nouvelle instance a été créée le %{date}"
|
66
|
+
subject: "%{domain}[%{type}] nouveau"
|
67
|
+
title: "Bonjour %{name}, nous voulions vous faire savoir qu'une nouvelle instance a été créée le %{date} pour le site <b>%{domain}</b>"
|
68
68
|
type: "Modèle: %{type}"
|
69
69
|
|
70
70
|
sites_picker:
|
@@ -106,7 +106,7 @@ fr:
|
|
106
106
|
edit:
|
107
107
|
title: Changer mon mot de passe
|
108
108
|
link: "→ Retour page de connexion"
|
109
|
-
password: "
|
109
|
+
password: "Entrez un nouveau mot de passe"
|
110
110
|
password_confirmation: "Confirmation nouveau mot de passe"
|
111
111
|
|
112
112
|
pages:
|
@@ -58,7 +58,7 @@ de:
|
|
58
58
|
errors:
|
59
59
|
messages:
|
60
60
|
blank_on_locale: "darf nicht leer sein"
|
61
|
-
|
61
|
+
|
62
62
|
attributes:
|
63
63
|
page:
|
64
64
|
title: Titel
|
@@ -107,6 +107,7 @@ de:
|
|
107
107
|
pagination:
|
108
108
|
previous: "« Zurück"
|
109
109
|
next: "Vor »"
|
110
|
+
|
110
111
|
date:
|
111
112
|
formats:
|
112
113
|
default: "%d.%m.%Y"
|
@@ -113,9 +113,12 @@ fr:
|
|
113
113
|
localized: Localisé ?
|
114
114
|
select_options: Options
|
115
115
|
|
116
|
-
|
117
|
-
|
118
|
-
|
116
|
+
date_picker:
|
117
|
+
close_text: Fermer
|
118
|
+
prev_text: '<Préc'
|
119
|
+
next_text: 'Suiv>'
|
120
|
+
current_text: 'Courant'
|
121
|
+
|
119
122
|
date:
|
120
123
|
formats:
|
121
124
|
default: "%d/%m/%Y"
|
@@ -7,7 +7,7 @@ de:
|
|
7
7
|
|
8
8
|
devise:
|
9
9
|
failure:
|
10
|
-
|
10
|
+
locomotive_account:
|
11
11
|
unauthenticated: 'Du musst dich einloggen oder registrieren bevor es weiter geht.'
|
12
12
|
unconfirmed: 'Du musst deinen Account aktivieren bevor es weiter geht.'
|
13
13
|
locked: 'Dein Account ist gesperrt.'
|
@@ -16,35 +16,35 @@ de:
|
|
16
16
|
timeout: 'Deine Session ist abgelaufe. Bitte logge dich erneut ein, dann geht es weiter.'
|
17
17
|
inactive: 'Dein Account wurde noch nicht aktiviert.'
|
18
18
|
sessions:
|
19
|
-
|
19
|
+
locomotive_account:
|
20
20
|
signed_in: 'Willkommen zu Hause!'
|
21
21
|
signed_out: 'Bis zum nächsten Mal.'
|
22
22
|
passwords:
|
23
|
-
|
23
|
+
locomotive_account:
|
24
24
|
send_instructions: 'Du bekommst in ein paar Minuten eine Email mit einer genauen Anleitung, wie du dein Passwort zurücksetzen kannst.'
|
25
25
|
updated: 'Dein Passwort wurde erfolgreich geändert. Du bist nun eingeloggt.'
|
26
26
|
confirmations:
|
27
|
-
|
27
|
+
locomotive_account:
|
28
28
|
send_instructions: 'Du bekommst in ein paar Minuten eine Email mit einer genauen Anleitung, wie du deinen Account aktivieren kannst.'
|
29
29
|
confirmed: 'Dein Account wurde erfolgreich aktiviert. Du bist nun eingeloggt.'
|
30
30
|
registrations:
|
31
|
-
|
31
|
+
locomotive_account:
|
32
32
|
signed_up: 'Du hast dich erfolgreich registriert.'
|
33
33
|
updated: 'Du hast deinen Account erfolgreich aktualisiert.'
|
34
34
|
destroyed: 'Tschüss! Dein Account wurder erfolgreich gelöscht. Hoffentlich sehen wir dich bald wieder!'
|
35
35
|
unlocks:
|
36
|
-
|
36
|
+
locomotive_account:
|
37
37
|
send_instructions: 'Du bekommst in ein paar Minuten eine Email mit einer genauen Anleitung, wie du deinen Account entsperren kannst.'
|
38
38
|
unlocked: 'Dein Account wurder erfolgreich entsperrt. Du bist nun eingeloggt.'
|
39
39
|
mailer:
|
40
|
-
|
40
|
+
locomotive_account:
|
41
41
|
confirmation_instructions: 'Anleitung zur Aktivierung'
|
42
42
|
reset_password_instructions: 'Anleitung zum Zurücksetzen deines Passworts'
|
43
43
|
unlock_instructions: 'Anleitung zur Entsperrung'
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
44
|
+
|
45
|
+
|
46
|
+
locomotive_account:
|
47
|
+
devise_mailer:
|
48
48
|
common:
|
49
49
|
hello: Hallo
|
50
50
|
|
@@ -7,7 +7,7 @@ es:
|
|
7
7
|
|
8
8
|
devise:
|
9
9
|
failure:
|
10
|
-
|
10
|
+
locomotive_account:
|
11
11
|
unauthenticated: 'Debe crear una cuenta o acceder con una cuenta existente para continuar.'
|
12
12
|
unconfirmed: 'Debe confirmar su cuenta para continuar.'
|
13
13
|
locked: 'Su cuenta está bloqueada.'
|
@@ -17,35 +17,35 @@ es:
|
|
17
17
|
timeout: 'Su sesión ha expirado. Por favor inicie una nueva sesión para continuar.'
|
18
18
|
inactive: 'Su cuenta no está activa.'
|
19
19
|
sessions:
|
20
|
-
|
20
|
+
locomotive_account:
|
21
21
|
signed_in: 'Sesión iniciada con éxito.'
|
22
22
|
signed_out: 'Sesión finalizada con éxito.'
|
23
23
|
passwords:
|
24
|
-
|
24
|
+
locomotive_account:
|
25
25
|
send_instructions: 'Recibirá un email con instrucciones para resetear su clave en unos minutos.'
|
26
26
|
updated: 'Su clave ha sido cambiada. Se ha iniciado una sesión.'
|
27
27
|
confirmations:
|
28
|
-
|
28
|
+
locomotive_account:
|
29
29
|
send_instructions: 'Recibirá un email con instrucciones para activar su clave en unos minutos.'
|
30
30
|
confirmed: 'Su cuenta ha sido activada. Se ha iniciado una sesión.'
|
31
31
|
registrations:
|
32
|
-
|
32
|
+
locomotive_account:
|
33
33
|
signed_up: 'Creación de cuenta realizada con éxito.'
|
34
34
|
updated: 'Se ha actualizado su cuenta con éxito.'
|
35
35
|
destroyed: '¡Hasta pronto! Su cuenta ha sido eliminada. Esperamos verle de nuevo.'
|
36
36
|
unlocks:
|
37
|
-
|
37
|
+
locomotive_account:
|
38
38
|
send_instructions: 'Recibirá un email con instrucciones para desbloquear su cuenta en unos minutos.'
|
39
39
|
unlocked: 'Su cuenta ha sido desbloqueada. Se ha iniciado una sesión.'
|
40
40
|
mailer:
|
41
|
-
|
41
|
+
locomotive_account:
|
42
42
|
confirmation_instructions: 'Instrucciones de activación'
|
43
43
|
reset_password_instructions: 'Instrucciones de reseteo de clave'
|
44
44
|
unlock_instructions: 'Instrucciones de desbloqueo'
|
45
45
|
|
46
46
|
|
47
|
-
|
48
|
-
|
47
|
+
locomotive_account:
|
48
|
+
devise_mailer:
|
49
49
|
common:
|
50
50
|
hello: Hola
|
51
51
|
|
@@ -7,7 +7,7 @@ fr:
|
|
7
7
|
|
8
8
|
devise:
|
9
9
|
failure:
|
10
|
-
|
10
|
+
locomotive_account:
|
11
11
|
unauthenticated: "Vous devez vous connecter ou vous inscrire avant de poursuivre."
|
12
12
|
unconfirmed: "Vous devez confirmer votre compte avant de poursuivre."
|
13
13
|
locked: "Votre compte a été vérrouillé."
|
@@ -16,37 +16,37 @@ fr:
|
|
16
16
|
timeout: "Votre session a expiré, veuillez vous reconnecter pour poursuivre."
|
17
17
|
inactive: "Votre compte n'a pas encore été activé."
|
18
18
|
sessions:
|
19
|
-
|
19
|
+
locomotive_account:
|
20
20
|
signed_in: "Connexion réussie."
|
21
21
|
signed_out: "Déconnexion réussie."
|
22
22
|
passwords:
|
23
|
-
|
23
|
+
locomotive_account:
|
24
24
|
send_instructions: "Vous allez recevoir un email avec les instructions pour réinitialiser votre mot de passe dans quelques minutes."
|
25
25
|
updated: "Votre mot de passe a été modifié avec succès. Vous êtes maintenant connecté."
|
26
26
|
confirmations:
|
27
|
-
|
27
|
+
locomotive_account:
|
28
28
|
send_instructions: "Vous allez recevoir un email avec les instruction pour confirmer votre compte dans quelques minutes."
|
29
29
|
confirmed: "Votre compte a été confirmé avec succès."
|
30
30
|
registrations:
|
31
|
-
|
31
|
+
locomotive_account:
|
32
32
|
signed_up: "Vous vous êtes inscrit avec succès. Vous allez recevoir les instructions de confirmation par email."
|
33
33
|
updated: "Vous avez mis à jour votre compte avec succès."
|
34
34
|
destroyed: "Au revoir. Votre compte a été fermé avec succès. Nous espérons vous revoir bientôt."
|
35
35
|
unlocks:
|
36
|
-
|
36
|
+
locomotive_account:
|
37
37
|
send_instructions: "Vous allez recevoir un email avec les instructions pour déverrouiller votre compte dans quelques minutes."
|
38
38
|
unlocked: "Votre compte a été déverrouillé avec succès. Vous êtes maintenant connecté."
|
39
39
|
mailer:
|
40
|
-
|
40
|
+
locomotive_account:
|
41
41
|
confirmation_instructions: "Instructions pour la confirmation"
|
42
42
|
reset_password_instructions: "Instructions pour la réinitialisation du mot de passe"
|
43
43
|
unlock_instructions: "Instructions pour le déverrouillage"
|
44
|
-
|
45
|
-
|
46
|
-
|
44
|
+
|
45
|
+
locomotive_account:
|
46
|
+
devise_mailer:
|
47
47
|
common:
|
48
|
-
hello:
|
49
|
-
|
48
|
+
hello: Bienvenue
|
49
|
+
|
50
50
|
confirmation_instructions:
|
51
51
|
you_can_confirm_your_account_through_the_link_below: "Vous pouvez confirmer votre compte via le lien ci-dessous:"
|
52
52
|
confirm_my_account: "Confirmer mon compte"
|
@@ -7,7 +7,7 @@ it:
|
|
7
7
|
|
8
8
|
devise:
|
9
9
|
failure:
|
10
|
-
|
10
|
+
locomotive_account:
|
11
11
|
unauthenticated: "E' necessario accedere o registrati prima di continuare."
|
12
12
|
unconfirmed: "E' necessario confermare l'account prima di continuare."
|
13
13
|
locked: 'Il tuo account è bloccato.'
|
@@ -17,35 +17,35 @@ it:
|
|
17
17
|
timeout: 'La tua sessione è scaduta, si prega di accedere nuovamente per continuare.'
|
18
18
|
inactive: 'Il tuo account non è stato ancora attivato.'
|
19
19
|
sessions:
|
20
|
-
|
20
|
+
locomotive_account:
|
21
21
|
signed_in: 'Login eseguito con successo.'
|
22
22
|
signed_out: 'Logout eseguito con successo.'
|
23
23
|
passwords:
|
24
|
-
|
24
|
+
locomotive_account:
|
25
25
|
send_instructions: 'Entro qualche minuti riceverai una email con le istruzioni su come reimpostare la password.'
|
26
26
|
updated: 'La tua password è stata cambiata con successo. Ora sei collegato.'
|
27
27
|
confirmations:
|
28
|
-
|
28
|
+
locomotive_account:
|
29
29
|
send_instructions: 'Entro qualche minuti riceverai un messaggio email con le istruzioni per confermare il tuo account.'
|
30
30
|
confirmed: 'Il tuo account è stato confermato. Ora sei collegato.'
|
31
31
|
registrations:
|
32
|
-
|
32
|
+
locomotive_account:
|
33
33
|
signed_up: 'Registrazione eseguita correttamente.'
|
34
34
|
updated: 'Il tuo account è stato aggiornato.'
|
35
35
|
destroyed: "Arrivederci! L'account è stato eliminato. Speriamo di rivederci presto."
|
36
36
|
unlocks:
|
37
|
-
|
37
|
+
locomotive_account:
|
38
38
|
send_instructions: 'Entro qualche minuti riceverai un messaggio email con le istruzioni per sbloccare il tuo account.'
|
39
39
|
unlocked: 'Il tuo account è stato correttamente sbloccato. Ora sei collegato.'
|
40
40
|
mailer:
|
41
|
-
|
41
|
+
locomotive_account:
|
42
42
|
confirmation_instructions: 'Istruzioni per la conferma'
|
43
43
|
reset_password_instructions: 'Istruzioni per reimpostare la password'
|
44
44
|
unlock_instructions: "Istruzioni per lo sblocco dell'account"
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
45
|
+
|
46
|
+
|
47
|
+
locomotive_account:
|
48
|
+
devise_mailer:
|
49
49
|
common:
|
50
50
|
hello: Ciao
|
51
51
|
|
@@ -42,10 +42,10 @@ nb:
|
|
42
42
|
confirmation_instructions: 'Bekreftelsesinstrukser'
|
43
43
|
reset_password_instructions: 'Instrukser for tilbakestilling av passord'
|
44
44
|
unlock_instructions: 'Instrukser for åpning'
|
45
|
-
|
46
|
-
|
45
|
+
|
46
|
+
|
47
47
|
locomotive_account:
|
48
|
-
|
48
|
+
devise_mailer:
|
49
49
|
common:
|
50
50
|
hello: Hallo
|
51
51
|
|
@@ -1,4 +1,4 @@
|
|
1
|
-
|
1
|
+
nl:
|
2
2
|
errors:
|
3
3
|
messages:
|
4
4
|
not_found: "not found"
|
@@ -7,7 +7,7 @@ en:
|
|
7
7
|
|
8
8
|
devise:
|
9
9
|
failure:
|
10
|
-
|
10
|
+
locomotive_account:
|
11
11
|
unauthenticated: 'You need to sign in or sign up before continuing.'
|
12
12
|
unconfirmed: 'You have to confirm your account before continuing.'
|
13
13
|
locked: 'Your account is locked.'
|
@@ -17,35 +17,35 @@ en:
|
|
17
17
|
timeout: 'Your session expired, please sign in again to continue.'
|
18
18
|
inactive: 'Your account was not activated yet.'
|
19
19
|
sessions:
|
20
|
-
|
20
|
+
locomotive_account:
|
21
21
|
signed_in: 'Signed in successfully.'
|
22
22
|
signed_out: 'Signed out successfully.'
|
23
23
|
passwords:
|
24
|
-
|
24
|
+
locomotive_account:
|
25
25
|
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
|
26
26
|
updated: 'Your password was changed successfully. You are now signed in.'
|
27
27
|
confirmations:
|
28
|
-
|
28
|
+
locomotive_account:
|
29
29
|
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
|
30
30
|
confirmed: 'Your account was successfully confirmed. You are now signed in.'
|
31
31
|
registrations:
|
32
|
-
|
32
|
+
locomotive_account:
|
33
33
|
signed_up: 'You have signed up successfully.'
|
34
34
|
updated: 'You updated your account successfully.'
|
35
35
|
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
|
36
36
|
unlocks:
|
37
|
-
|
37
|
+
locomotive_account:
|
38
38
|
send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
|
39
39
|
unlocked: 'Your account was successfully unlocked. You are now signed in.'
|
40
40
|
mailer:
|
41
|
-
|
41
|
+
locomotive_account:
|
42
42
|
confirmation_instructions: 'Confirmation instructions'
|
43
43
|
reset_password_instructions: 'Reset password instructions'
|
44
44
|
unlock_instructions: 'Unlock Instructions'
|
45
45
|
|
46
46
|
|
47
|
-
|
48
|
-
|
47
|
+
locomotive_account:
|
48
|
+
devise_mailer:
|
49
49
|
common:
|
50
50
|
hello: Hello
|
51
51
|
|
@@ -7,7 +7,7 @@ pt-BR:
|
|
7
7
|
|
8
8
|
devise:
|
9
9
|
failure:
|
10
|
-
|
10
|
+
locomotive_account:
|
11
11
|
unauthenticated: 'Você precisa se cadasstrar ou fazer o login antes de continuar.'
|
12
12
|
unconfirmed: 'Você deve confirmar sua conta antes de continuar.'
|
13
13
|
locked: 'Sua conta está bloquada.'
|
@@ -16,35 +16,35 @@ pt-BR:
|
|
16
16
|
timeout: 'Sua sessão expirou. Por favor, faça o login novamente para continuar.'
|
17
17
|
inactive: 'Sua conta não foi ativada ainda.'
|
18
18
|
sessions:
|
19
|
-
|
19
|
+
locomotive_account:
|
20
20
|
signed_in: 'Login feito com sucesso.'
|
21
21
|
signed_out: 'Logout feito com sucesso.'
|
22
22
|
passwords:
|
23
|
-
|
23
|
+
locomotive_account:
|
24
24
|
send_instructions: 'Você receberá um email com as instruções sobre como alterar sua senha em poucos minutos.'
|
25
25
|
updated: 'Sua senha foi alterada com sucesso. Você está logado.'
|
26
26
|
confirmations:
|
27
|
-
|
27
|
+
locomotive_account:
|
28
28
|
send_instructions: 'Você receberá um email com as instruções sobre como confirmar sua conta em poucos minutos.'
|
29
29
|
confirmed: 'Sua conta foi confirmada com sucesso. Você está logado.'
|
30
30
|
registrations:
|
31
|
-
|
31
|
+
locomotive_account:
|
32
32
|
signed_up: 'Você logou com sucesso.'
|
33
33
|
updated: 'Atualização da conta feita com sucesso.'
|
34
34
|
destroyed: 'Sua conta foi cancelada com sucesso. Logo logo esperamos te ver por aqui. Tchau!'
|
35
35
|
unlocks:
|
36
|
-
|
36
|
+
locomotive_account:
|
37
37
|
send_instructions: 'Você receberá um email com as intruções de como desbloquear sua conta em poucos minutos.'
|
38
38
|
unlocked: 'Sua conta foi desbloqueada com sucesso. Você está logado.'
|
39
39
|
mailer:
|
40
|
-
|
40
|
+
locomotive_account:
|
41
41
|
confirmation_instructions: 'Instruções de confirmação'
|
42
42
|
reset_password_instructions: 'Instruções para resetar a senha.'
|
43
43
|
unlock_instructions: 'Instruções de desbloqueio'
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
44
|
+
|
45
|
+
|
46
|
+
locomotive_account:
|
47
|
+
devise_mailer:
|
48
48
|
common:
|
49
49
|
hello: Olá
|
50
50
|
confirmation_instructions:
|