comfortable_mexican_sofa 1.12.7 → 1.12.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -1
- data/app/assets/javascripts/comfy/admin/cms/application.js.coffee +1 -1
- data/app/assets/javascripts/comfy/admin/cms/base.js.coffee +4 -2
- data/app/assets/javascripts/comfy/admin/cms/lib/redactor.js +309 -218
- data/app/assets/javascripts/comfy/admin/cms/lib/redactor/definedlinks.js +53 -0
- data/app/controllers/comfy/admin/cms/pages_controller.rb +21 -0
- data/app/helpers/comfy/cms_helper.rb +1 -1
- data/app/models/comfy/cms/site.rb +1 -1
- data/app/views/comfy/admin/cms/pages/_form.html.haml +2 -4
- data/app/views/layouts/comfy/admin/cms/_head.html.haml +1 -0
- data/config/environments/test.rb +4 -0
- data/config/locales/cs.yml +28 -23
- data/config/locales/da.yml +36 -31
- data/config/locales/de.yml +32 -27
- data/config/locales/en.yml +10 -7
- data/config/locales/es.yml +21 -16
- data/config/locales/fr.yml +28 -23
- data/config/locales/it.yml +12 -7
- data/config/locales/ja.yml +28 -23
- data/config/locales/nb.yml +12 -7
- data/config/locales/nl.yml +21 -16
- data/config/locales/pl.yml +28 -23
- data/config/locales/pt-BR.yml +27 -22
- data/config/locales/ru.yml +19 -16
- data/config/locales/sv.yml +28 -23
- data/config/locales/uk.yml +10 -7
- data/config/locales/zh-CN.yml +22 -17
- data/config/locales/zh-TW.yml +22 -17
- data/lib/comfortable_mexican_sofa/render_methods.rb +1 -1
- data/lib/comfortable_mexican_sofa/version.rb +1 -1
- data/test/controllers/comfy/admin/cms/pages_controller_test.rb +59 -46
- data/test/gemfiles/Gemfile.rails.4.0 +2 -2
- data/test/gemfiles/Gemfile.rails.4.1 +1 -1
- data/test/gemfiles/Gemfile.rails.4.2 +1 -1
- data/test/gemfiles/Gemfile.rails.master +1 -1
- data/test/integration/i18n_test.rb +37 -0
- data/test/integration/js_variables_test.rb +1 -0
- data/test/lib/mirrors_test.rb +35 -35
- metadata +4 -2
data/config/locales/de.yml
CHANGED
@@ -1,12 +1,5 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
de:
|
3
|
-
attributes:
|
4
|
-
label: Bezeichnung
|
5
|
-
slug: Form
|
6
|
-
parent_id: Vorfahre
|
7
|
-
content: Inhalt
|
8
|
-
identifier: Identifikator
|
9
|
-
full_path: Full path
|
10
3
|
activerecord:
|
11
4
|
models:
|
12
5
|
comfy/cms/site: Web
|
@@ -14,31 +7,40 @@ de:
|
|
14
7
|
comfy/cms/page: Seite
|
15
8
|
comfy/cms/snippet: Schnipsel
|
16
9
|
comfy/cms/file: Datei
|
10
|
+
|
17
11
|
attributes:
|
18
12
|
comfy/cms/site:
|
19
|
-
identifier:
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
13
|
+
identifier: Name
|
14
|
+
label: Bezeichnung
|
15
|
+
hostname: Hostname
|
16
|
+
path: Pfad
|
17
|
+
locale: Sprache
|
18
|
+
is_mirrored: Gespiegelt
|
24
19
|
comfy/cms/layout:
|
25
|
-
identifier:
|
20
|
+
identifier: Eindeutiger Name
|
26
21
|
label: Name
|
27
22
|
app_layout: Grundlegendes Layout
|
28
23
|
parent_id: Übergeordnetes Layout
|
29
|
-
|
30
|
-
|
24
|
+
content: Inhalt
|
25
|
+
css: CSS-Stilvorlage
|
26
|
+
js: JavaScript
|
31
27
|
comfy/cms/page:
|
32
|
-
label:
|
28
|
+
label: Titel
|
33
29
|
layout_id: Layout
|
34
|
-
slug:
|
30
|
+
slug: URL
|
31
|
+
full_path: Vollständiger Pfad
|
32
|
+
parent_id: Vorfahre
|
35
33
|
target_page_id: Weiterleitung zu Seite
|
34
|
+
content: Inhalt
|
36
35
|
is_published: Veröffentlicht
|
37
36
|
comfy/cms/file:
|
37
|
+
label: Bezeichnung
|
38
38
|
file: Datei
|
39
39
|
description: Beschreibung
|
40
40
|
comfy/cms/snippet:
|
41
|
-
identifier:
|
41
|
+
identifier: Eindeutiger Name
|
42
|
+
label: Bezeichnung
|
43
|
+
content: Inhalt
|
42
44
|
|
43
45
|
comfy:
|
44
46
|
cms:
|
@@ -148,9 +150,10 @@ de:
|
|
148
150
|
cancel: Abbrechen
|
149
151
|
update: Seite speichern
|
150
152
|
is_published: Veröffentlicht
|
153
|
+
choose_link: Seite auswählen...
|
151
154
|
form_blocks:
|
152
155
|
no_tags: |-
|
153
|
-
Das gewählte Layout hat kein Comfy-
|
156
|
+
Das gewählte Layout hat kein Comfy-Tags deklariert, daher kann diese Seite nicht bearbeitet werden.<br/>
|
154
157
|
Beispiel: <code>{{ cms:page:content }}</code>
|
155
158
|
|
156
159
|
snippets:
|
@@ -187,7 +190,7 @@ de:
|
|
187
190
|
title: Versionen von
|
188
191
|
revision: Version
|
189
192
|
full_path: Vollständiger Pfad
|
190
|
-
slug:
|
193
|
+
slug: URL
|
191
194
|
update: Zurücksetzen auf gewählte Version
|
192
195
|
content: Inhalt
|
193
196
|
changes: Änderungen
|
@@ -195,29 +198,31 @@ de:
|
|
195
198
|
current: Aktuell
|
196
199
|
|
197
200
|
files:
|
198
|
-
created: Datei
|
199
|
-
creation_failure: Fehler beim
|
200
|
-
updated: Datei
|
201
|
+
created: Datei hochgeladen
|
202
|
+
creation_failure: Fehler beim Hochladen der Datei!
|
203
|
+
updated: Datei hochgeladen
|
201
204
|
update_failure: Fehler beim Aktualisieren der Datei!
|
202
205
|
deleted: Datei gelöscht
|
203
206
|
not_found: Datei nicht gefunden
|
204
207
|
|
205
208
|
index:
|
206
209
|
title: Datei
|
207
|
-
new_link: Neue Datei
|
210
|
+
new_link: Neue Datei hochladen
|
208
211
|
edit: Datei bearbeiten
|
209
212
|
delete: Datei löschen
|
210
213
|
are_you_sure: Sind Sie sicher, dass Sie diese Datei löschen möchten?
|
211
|
-
button: Datei
|
214
|
+
button: Datei hochladen
|
212
215
|
new:
|
213
|
-
title: Datei
|
216
|
+
title: Datei erstellen
|
214
217
|
edit:
|
215
218
|
title: Datei bearbeiten
|
216
219
|
form:
|
217
220
|
current_file: Aktuelle Datei
|
218
|
-
create: Datei
|
221
|
+
create: Datei hochladen
|
219
222
|
cancel: Abbrechen
|
220
223
|
update: Datei speichern
|
224
|
+
delete: Datei löschen
|
225
|
+
are_you_sure: Sind Sie sicher, dass Sie diese Datei löschen möchten?
|
221
226
|
page_form:
|
222
227
|
are_you_sure: Sind Sie sicher?
|
223
228
|
file:
|
data/config/locales/en.yml
CHANGED
@@ -1,12 +1,5 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
en:
|
3
|
-
attributes:
|
4
|
-
label: Label
|
5
|
-
slug: Slug
|
6
|
-
parent_id: Parent
|
7
|
-
content: Content
|
8
|
-
identifier: Identifier
|
9
|
-
full_path: Full path
|
10
3
|
activerecord:
|
11
4
|
models:
|
12
5
|
comfy/cms/site: Site
|
@@ -14,9 +7,11 @@ en:
|
|
14
7
|
comfy/cms/page: Page
|
15
8
|
comfy/cms/snippet: Snippet
|
16
9
|
comfy/cms/file: File
|
10
|
+
|
17
11
|
attributes:
|
18
12
|
comfy/cms/site:
|
19
13
|
identifier: Identifier
|
14
|
+
label: Label
|
20
15
|
hostname: Hostname
|
21
16
|
path: Path
|
22
17
|
locale: Language
|
@@ -26,19 +21,26 @@ en:
|
|
26
21
|
label: Layout Name
|
27
22
|
app_layout: App Layout
|
28
23
|
parent_id: Parent Layout
|
24
|
+
content: Content
|
29
25
|
css: Stylesheet
|
30
26
|
js: Javascript
|
31
27
|
comfy/cms/page:
|
32
28
|
label: Label
|
33
29
|
layout_id: Layout
|
34
30
|
slug: Slug
|
31
|
+
full_path: Full path
|
32
|
+
parent_id: Parent
|
35
33
|
target_page_id: Redirect to Page
|
34
|
+
content: Content
|
36
35
|
is_published: Published
|
37
36
|
comfy/cms/file:
|
37
|
+
label: Label
|
38
38
|
file: File
|
39
39
|
description: Description
|
40
40
|
comfy/cms/snippet:
|
41
|
+
label: Label
|
41
42
|
identifier: Identifier
|
43
|
+
content: Content
|
42
44
|
|
43
45
|
comfy:
|
44
46
|
cms:
|
@@ -148,6 +150,7 @@ en:
|
|
148
150
|
cancel: Cancel
|
149
151
|
update: Update Page
|
150
152
|
is_published: Published
|
153
|
+
choose_link: Select page...
|
151
154
|
form_blocks:
|
152
155
|
no_tags: |-
|
153
156
|
Layout has no content tags defined.<br/>
|
data/config/locales/es.yml
CHANGED
@@ -1,12 +1,5 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
es:
|
3
|
-
attributes:
|
4
|
-
label: Nombre
|
5
|
-
slug: Identificador
|
6
|
-
parent_id: Padre
|
7
|
-
content: Contenido
|
8
|
-
identifier: Identifier
|
9
|
-
full_path: Full path
|
10
3
|
activerecord:
|
11
4
|
models:
|
12
5
|
comfy/cms/site: Sitio
|
@@ -14,9 +7,11 @@ es:
|
|
14
7
|
comfy/cms/page: Página
|
15
8
|
comfy/cms/snippet: Fragmento
|
16
9
|
comfy/cms/file: File
|
10
|
+
|
17
11
|
attributes:
|
18
12
|
comfy/cms/site:
|
19
13
|
identifier: Identifier
|
14
|
+
label: Nombre
|
20
15
|
hostname: Dirección
|
21
16
|
path: Ruta
|
22
17
|
locale: Lengua
|
@@ -26,19 +21,26 @@ es:
|
|
26
21
|
label: Nombre de Plantilla
|
27
22
|
app_layout: Plantilla Base
|
28
23
|
parent_id: Plantilla Padre
|
24
|
+
content: Contenido
|
29
25
|
css: Hoja de Estilo
|
30
26
|
js: Javascript
|
31
27
|
comfy/cms/page:
|
32
28
|
label: Título
|
33
29
|
layout_id: Plantilla
|
34
30
|
slug: Ruta
|
31
|
+
full_path: Full path
|
32
|
+
parent_id: Padre
|
35
33
|
target_page_id: Redirigir a
|
34
|
+
content: Contenido
|
36
35
|
is_published: Publicada
|
37
36
|
comfy/cms/file:
|
37
|
+
label: Nombre
|
38
38
|
file: File
|
39
39
|
description: Description
|
40
40
|
comfy/cms/snippet:
|
41
|
+
label: Nombre
|
41
42
|
identifier: Identifier
|
43
|
+
content: Contenido
|
42
44
|
|
43
45
|
comfy:
|
44
46
|
cms:
|
@@ -46,13 +48,13 @@ es:
|
|
46
48
|
site_not_found: Sitio no encontrado
|
47
49
|
layout_not_found: Diseño no encontrado
|
48
50
|
page_not_found: Página no encontrada
|
49
|
-
|
51
|
+
|
50
52
|
admin:
|
51
53
|
cms:
|
52
54
|
base:
|
53
55
|
site_not_found: Sitio no encontrado
|
54
56
|
fixtures_enabled: CMS Fixtures habilitadas. Todos los cambios realizados serán descartados.
|
55
|
-
|
57
|
+
|
56
58
|
sites: Sitios
|
57
59
|
layouts: Diseños
|
58
60
|
pages: Páginas
|
@@ -66,7 +68,7 @@ es:
|
|
66
68
|
update_failure: El sitio no ha podido ser actualizado
|
67
69
|
deleted: Sitio eliminado
|
68
70
|
not_found: Sitio no encontrado
|
69
|
-
|
71
|
+
|
70
72
|
index:
|
71
73
|
title: Listado de Sitios
|
72
74
|
new_link: Crear nuevo Sitio
|
@@ -91,7 +93,7 @@ es:
|
|
91
93
|
update_failure: El diseño NO ha podido ser Actualizado
|
92
94
|
deleted: Diseñó Eliminado
|
93
95
|
not_found: Diseño no encontrado
|
94
|
-
|
96
|
+
|
95
97
|
index:
|
96
98
|
title: Diseños
|
97
99
|
new_link: Crear Nuevo Diseño
|
@@ -125,7 +127,7 @@ es:
|
|
125
127
|
deleted: Página eliminada
|
126
128
|
not_found: Página no encontrada
|
127
129
|
layout_not_found: No se ha encontrado una plantilla. Cree una primero.
|
128
|
-
|
130
|
+
|
129
131
|
index:
|
130
132
|
title: Páginas
|
131
133
|
new_link: Crear Nueva Página
|
@@ -148,6 +150,7 @@ es:
|
|
148
150
|
cancel: Cancelar
|
149
151
|
update: Actualizar Página
|
150
152
|
is_published: Publicada
|
153
|
+
choose_link: Select page...
|
151
154
|
form_blocks:
|
152
155
|
no_tags: |-
|
153
156
|
La plantilla no tiene etiquetas de contenido definidas.<br/>
|
@@ -160,7 +163,7 @@ es:
|
|
160
163
|
update_failure: El fragmento no ha podido ser actualizado
|
161
164
|
deleted: Fragmento eliminado
|
162
165
|
not_found: Fragmento no encontrado
|
163
|
-
|
166
|
+
|
164
167
|
index:
|
165
168
|
title: Fragmentos
|
166
169
|
new_link: Crear nuevo Fragmento
|
@@ -182,7 +185,7 @@ es:
|
|
182
185
|
reverted: Contenido revertido
|
183
186
|
record_not_found: Registro no encontrado
|
184
187
|
not_found: Revisión no encontrada
|
185
|
-
|
188
|
+
|
186
189
|
show:
|
187
190
|
title: Revisiones de
|
188
191
|
revision: Revisión
|
@@ -201,7 +204,7 @@ es:
|
|
201
204
|
update_failure: Fallo la actualización del archivo
|
202
205
|
deleted: Archivo borrado
|
203
206
|
not_found: Archivo no encontrado
|
204
|
-
|
207
|
+
|
205
208
|
index:
|
206
209
|
title: Archivos
|
207
210
|
new_link: Subir Nuevo Archivo
|
@@ -218,11 +221,13 @@ es:
|
|
218
221
|
create: Subir Archivo
|
219
222
|
cancel: Cancelar
|
220
223
|
update: Actualizar Archivo
|
224
|
+
delete: Borrar
|
225
|
+
are_you_sure: ¿Estás seguro?
|
221
226
|
page_form:
|
222
227
|
are_you_sure: ¿Estás seguro?
|
223
228
|
file:
|
224
229
|
are_you_sure: ¿Estás seguro?
|
225
|
-
|
230
|
+
|
226
231
|
categories:
|
227
232
|
index:
|
228
233
|
label: Categorias
|
data/config/locales/fr.yml
CHANGED
@@ -1,12 +1,5 @@
|
|
1
1
|
# encoding: utf-8
|
2
2
|
fr:
|
3
|
-
attributes:
|
4
|
-
label: Nom
|
5
|
-
slug: Identifiant
|
6
|
-
parent_id: Parent
|
7
|
-
content: Contenu
|
8
|
-
identifier: Identifiant
|
9
|
-
full_path: Full path
|
10
3
|
activerecord:
|
11
4
|
models:
|
12
5
|
comfy/cms/site: Site
|
@@ -14,9 +7,11 @@ fr:
|
|
14
7
|
comfy/cms/page: Page
|
15
8
|
comfy/cms/snippet: Fragment
|
16
9
|
comfy/cms/file: Fichier
|
10
|
+
|
17
11
|
attributes:
|
18
12
|
comfy/cms/site:
|
19
13
|
identifier: Identifiant
|
14
|
+
label: Nom
|
20
15
|
hostname: Nom d'hôte
|
21
16
|
path: Chemin
|
22
17
|
locale: Langue
|
@@ -26,33 +21,40 @@ fr:
|
|
26
21
|
label: Nom de la mise en page
|
27
22
|
app_layout: Mise en page de l'application
|
28
23
|
parent_id: Mise en page parent
|
24
|
+
content: Contenu
|
29
25
|
css: Feuille de style
|
30
26
|
js: Javascript
|
31
27
|
comfy/cms/page:
|
32
28
|
label: Nom de la page
|
33
29
|
layout_id: Mise en page
|
34
30
|
slug: Identifiant
|
31
|
+
full_path: Full path
|
32
|
+
parent_id: Parent
|
35
33
|
target_page_id: Rediriger vers
|
34
|
+
content: Contenu
|
36
35
|
is_published: Publié
|
37
36
|
comfy/cms/file:
|
37
|
+
label: Nom
|
38
38
|
file: Fichier
|
39
39
|
description: Description
|
40
40
|
comfy/cms/snippet:
|
41
41
|
identifier: Identifiant
|
42
|
-
|
42
|
+
label: Nom
|
43
|
+
content: Contenu
|
44
|
+
|
43
45
|
comfy:
|
44
46
|
cms:
|
45
47
|
content:
|
46
48
|
site_not_found: Site introuvable
|
47
49
|
layout_not_found: Mise en page introuvable
|
48
50
|
page_not_found: Page introuvable
|
49
|
-
|
51
|
+
|
50
52
|
admin:
|
51
53
|
cms:
|
52
54
|
base:
|
53
55
|
site_not_found: Site introuvable
|
54
56
|
fixtures_enabled: Fixtures activés. Toutes les modifications seront supprimées.
|
55
|
-
|
57
|
+
|
56
58
|
sites: Sites
|
57
59
|
layouts: Mises en page
|
58
60
|
pages: Pages
|
@@ -66,7 +68,7 @@ fr:
|
|
66
68
|
update_failure: Échec de la modification du site
|
67
69
|
deleted: Site supprimé
|
68
70
|
not_found: Site introuvable
|
69
|
-
|
71
|
+
|
70
72
|
index:
|
71
73
|
title: Sites
|
72
74
|
new_link: Nouveau site
|
@@ -83,7 +85,7 @@ fr:
|
|
83
85
|
cancel: Annuler
|
84
86
|
update: Modifier le site
|
85
87
|
is_mirrored: En miroir
|
86
|
-
|
88
|
+
|
87
89
|
layouts:
|
88
90
|
created: Mise en page créée
|
89
91
|
creation_failure: Échec de la création de la mise en page
|
@@ -91,7 +93,7 @@ fr:
|
|
91
93
|
update_failure: Échec de la modification de la mise en page
|
92
94
|
deleted: Mise en page supprimée
|
93
95
|
not_found: Mise en page introuvable
|
94
|
-
|
96
|
+
|
95
97
|
index:
|
96
98
|
title: Mises en page
|
97
99
|
new_link: Nouvelle mise en page
|
@@ -116,7 +118,7 @@ fr:
|
|
116
118
|
create: Créer la mise en page
|
117
119
|
cancel: Annuler
|
118
120
|
update: Modifier la mise en page
|
119
|
-
|
121
|
+
|
120
122
|
pages:
|
121
123
|
created: Page créée
|
122
124
|
creation_failure: Échec de la création de la page
|
@@ -125,7 +127,7 @@ fr:
|
|
125
127
|
deleted: Page supprimée
|
126
128
|
not_found: Page introuvable
|
127
129
|
layout_not_found: Aucune mise en page disponible. Créez-en une nouvelle.
|
128
|
-
|
130
|
+
|
129
131
|
index:
|
130
132
|
title: Pages
|
131
133
|
new_link: Nouvelle page
|
@@ -148,11 +150,12 @@ fr:
|
|
148
150
|
cancel: Annuler
|
149
151
|
update: Modifier la page
|
150
152
|
is_published: Publié
|
153
|
+
choose_link: Select page...
|
151
154
|
form_blocks:
|
152
155
|
no_tags: |-
|
153
156
|
Mise en page sans aucun tag de contenu.<br/>
|
154
157
|
Modifiez le contenu pour y ajouter un tag de page ou de champ. Exemple : <code>{{cms:page:content}}</code>
|
155
|
-
|
158
|
+
|
156
159
|
snippets:
|
157
160
|
created: Fragment créé
|
158
161
|
creation_failure: Échec de la création du fragment
|
@@ -160,7 +163,7 @@ fr:
|
|
160
163
|
update_failure: Échec de la modification du fragment
|
161
164
|
deleted: Fragment supprimé
|
162
165
|
not_found: Fragment introuvable
|
163
|
-
|
166
|
+
|
164
167
|
index:
|
165
168
|
title: Fragments
|
166
169
|
new_link: Nouveau fragment
|
@@ -177,23 +180,23 @@ fr:
|
|
177
180
|
create: Créer le fragment
|
178
181
|
cancel: Annuler
|
179
182
|
update: Modifier le fragment
|
180
|
-
|
183
|
+
|
181
184
|
revisions:
|
182
185
|
reverted: Contenu restauré
|
183
186
|
record_not_found: Enregistrement introuvable
|
184
187
|
not_found: Révision introuvable
|
185
|
-
|
188
|
+
|
186
189
|
show:
|
187
190
|
title: "Révisions :"
|
188
191
|
revision: révision
|
189
|
-
full_path: Chemin complet
|
192
|
+
full_path: Chemin complet
|
190
193
|
slug: Identifiant
|
191
194
|
update: Restaurer cette révision
|
192
195
|
content: Content
|
193
196
|
changes: Changes
|
194
197
|
previous: Previous
|
195
198
|
current: Actuel
|
196
|
-
|
199
|
+
|
197
200
|
files:
|
198
201
|
created: Fichier téléchargé
|
199
202
|
creation_failure: Échec du téléchargement du fichier
|
@@ -201,7 +204,7 @@ fr:
|
|
201
204
|
update_failure: Échec de la modification du fichier
|
202
205
|
deleted: Fichier supprimé
|
203
206
|
not_found: Fichier introuvable
|
204
|
-
|
207
|
+
|
205
208
|
index:
|
206
209
|
title: Fichiers
|
207
210
|
new_link: Nouveau fichier
|
@@ -218,11 +221,13 @@ fr:
|
|
218
221
|
create: Envoyer
|
219
222
|
cancel: Annuler
|
220
223
|
update: Modifier le fichier
|
224
|
+
delete: Supprimer
|
225
|
+
are_you_sure: Êtes-vous sûr de vouloir supprimer ce fichier ?
|
221
226
|
page_form:
|
222
227
|
are_you_sure: Êtes-vous sûr de vouloir supprimer ce fichier ?
|
223
228
|
file:
|
224
229
|
are_you_sure: Êtes-vous sûr de vouloir supprimer ce fichier ?
|
225
|
-
|
230
|
+
|
226
231
|
categories:
|
227
232
|
index:
|
228
233
|
label: Catégories
|