tkh_content 0.3.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. data/CHANGELOG.md +25 -0
  2. data/app/assets/javascripts/ckeditor/config.js.coffee +1 -1
  3. data/app/controllers/blog_controller.rb +5 -2
  4. data/app/controllers/comments_controller.rb +14 -6
  5. data/app/controllers/contacts_controller.rb +7 -2
  6. data/app/controllers/pages_controller.rb +3 -3
  7. data/app/mailers/contact_mailer.rb +3 -3
  8. data/app/models/page.rb +0 -1
  9. data/app/views/blog/index.atom.builder +14 -0
  10. data/app/views/blog/index.html.erb +3 -2
  11. data/app/views/comments/_list_of_comments.html.erb +8 -8
  12. data/app/views/comments/_status_buttons.html.erb +3 -3
  13. data/app/views/comments/_tab_admin_menu.html.erb +8 -0
  14. data/app/views/comments/accepted.html.erb +29 -0
  15. data/app/views/comments/blocked.html.erb +29 -0
  16. data/app/views/comments/edit.html.erb +4 -1
  17. data/app/views/comments/for_feed.atom.builder +16 -0
  18. data/app/views/comments/index.html.erb +15 -14
  19. data/app/views/comments/pending.html.erb +31 -0
  20. data/app/views/contact_mailer/message_from_contact_form.text.erb +4 -5
  21. data/app/views/contacts/_tab_admin_menu.html.erb +4 -0
  22. data/app/views/contacts/index.html.erb +8 -6
  23. data/app/views/contacts/show.html.erb +18 -0
  24. data/app/views/pages/_admin_context_menu.html.erb +23 -12
  25. data/app/views/pages/_blog_post_meta.html.erb +4 -2
  26. data/app/views/pages/_comment_section.html.erb +1 -3
  27. data/app/views/pages/_form.html.erb +6 -6
  28. data/app/views/pages/_new_comment_section.html.erb +2 -2
  29. data/app/views/pages/_tab_admin_menu.html.erb +5 -0
  30. data/app/views/pages/edit.html.erb +4 -1
  31. data/app/views/pages/index.html.erb +9 -9
  32. data/app/views/pages/new.html.erb +4 -1
  33. data/app/views/pages/show.html.erb +2 -0
  34. data/app/views/shared/_admin_sidebar.html.erb +1 -1
  35. data/config/routes.rb +1 -0
  36. data/lib/generators/tkh_content/create_or_update_locales/templates/de.yml +78 -27
  37. data/lib/generators/tkh_content/create_or_update_locales/templates/en.yml +43 -16
  38. data/lib/generators/tkh_content/create_or_update_locales/templates/es.yml +72 -15
  39. data/lib/generators/tkh_content/create_or_update_locales/templates/fr.yml +73 -16
  40. data/lib/generators/tkh_content/create_or_update_locales/templates/it.yml +109 -0
  41. data/lib/tkh_content/version.rb +1 -1
  42. metadata +14 -5
  43. data/app/views/blog/index.rss.builder +0 -18
@@ -1,19 +1,16 @@
1
1
  es:
2
2
 
3
- time:
4
- formats:
5
- # eventually this should be abstracted to a tkh_utilities gem together with all
6
- # standard helpers and functionality
7
- tkh_default: "%d de %B de %Y %H:%M"
8
-
9
- are_you_sure: '¿estás seguro?'
10
- colon: ':'
11
- delete: 'borrar'
12
- edit: 'editar'
13
- pages: 'paginas'
14
- sections: 'secciones'
15
-
16
- activerecord:
3
+ activerecord:
4
+ models:
5
+ comment: 'comment'
6
+ comments: 'comments'
7
+ contact: 'contact'
8
+ contacts: 'contacts'
9
+ page: 'page'
10
+ pages: 'pages'
11
+ tag: 'tag'
12
+ tags: 'tags'
13
+
17
14
  attributes:
18
15
  pages:
19
16
  title: "título"
@@ -21,16 +18,29 @@ es:
21
18
  description: "descripción"
22
19
  body: "parte principal"
23
20
  for_the_blog: 'contraseña'
21
+ parent_title: 'page parent title'
24
22
 
25
23
  contacts:
26
24
  sender_name: "nombre del remitente"
27
25
  sender_email: 'correo electrónico del remitente'
28
26
  body: 'mensaje'
27
+
28
+ comments:
29
+ author: 'author'
30
+ body: "body text"
31
+ locale: 'language'
32
+ status: 'status'
29
33
 
30
34
  pages:
31
35
  author: 'autor'
32
36
  create_new: 'crear una nueva página'
37
+ edit_this: 'edit this page'
38
+ home: 'home page'
39
+ not_published_yet: 'Not published yet'
40
+ publish: 'publish'
33
41
  published: '¿publicado?'
42
+ unpublish: 'unpublish'
43
+ reorder_root_menus: 'reorder root menu items'
34
44
 
35
45
  create:
36
46
  notice: 'La página se ha creado correctamente'
@@ -41,12 +51,59 @@ es:
41
51
  destroy:
42
52
  notice: 'la página se ha eliminado'
43
53
  root_warning: "No se puede eliminar la página, ya que es la bienvenida principal. Por favor, cámbialo."
54
+ hint:
55
+ title: 'nice and descriptive'
56
+ short_title: 'ideally one word only, used for the menu'
57
+ status:
58
+ changed:
59
+ published: 'The page has been published'
60
+ unpublished: "The page has been unpublished. It's a draft again."
61
+ toggled: "The blog status of the page has been changed"
44
62
 
45
63
  contacts:
46
64
  messages_from_forms: 'mensajes del formulario de contacto'
47
65
  send_message: 'enviar el mensaje'
48
66
  sent: 'Enviado a las'
49
-
50
67
  create:
68
+ did_not_reach: 'Something went wrong. Your message did not reach the intended recipient.'
69
+ invalid_email: 'Your email address does not seem to be valid!'
51
70
  notice: 'Tu mensaje ha sido enviado.'
52
71
  warning: 'Hubo un problema al enviar su mensaje.'
72
+ mailer:
73
+ intro: 'Here is the message sent via the contact form on the web site:'
74
+ sender_name: "Sender's name:"
75
+ sender_email: "Sender's email:"
76
+ message: 'Message:'
77
+
78
+ comments:
79
+ login_needed: 'You need to be logged in to leave a comment'
80
+ sorted_by_oldest: 'This section is sorted by oldest comment first so that they can be moderated from top to bottom.'
81
+ what_do_you_think: 'What do you think?'
82
+
83
+ create:
84
+ notice: 'The comment was successfully created.'
85
+ warning: 'There was a problem saving the comment to the database'
86
+ update:
87
+ notice: 'The comment was successfully updated.'
88
+ warning: 'There was a problem saving this comment'
89
+ destroy:
90
+ notice: 'The comment was deleted'
91
+ moderation:
92
+ accept:
93
+ notice: "This comment has been accepted"
94
+ warning: "Some error occurred and the comment could not be moderated and accepted"
95
+ block:
96
+ notice: "This comment has been blocked"
97
+ warning: "Some error occurred and the comment could not be moderated and blocked"
98
+ actions:
99
+ accept: "accept!"
100
+ block: "block!"
101
+ status:
102
+ pending: 'pending'
103
+ accepted: 'accepted'
104
+ blocked: 'blocked'
105
+
106
+ blog:
107
+ itself: 'blog'
108
+ home: 'home blog'
109
+ official: 'the official blog'
@@ -1,19 +1,16 @@
1
1
  fr:
2
2
 
3
- time:
4
- formats:
5
- # eventually this should be abstracted to a tkh_utilities gem together with all
6
- # standard helpers and functionality
7
- tkh_default: "%d %b %Y à %H:%M"
8
-
9
- are_you_sure: 'êtes vous sûr ?'
10
- colon: ' :'
11
- delete: 'supprimer'
12
- edit: 'modifier'
13
- pages: 'pages'
14
- sections: 'sections'
15
-
16
- activerecord:
3
+ activerecord:
4
+ models:
5
+ comment: 'commentaire'
6
+ comments: 'commentaires'
7
+ contact: 'contact'
8
+ contacts: 'les contacts'
9
+ page: 'page'
10
+ pages: 'les pages'
11
+ tag: 'étiquette'
12
+ tags: 'les étiquettes'
13
+
17
14
  attributes:
18
15
  pages:
19
16
  title: "titre"
@@ -21,16 +18,29 @@ fr:
21
18
  description: "description"
22
19
  body: "texte principal"
23
20
  for_the_blog: 'pour le blog'
21
+ parent_title: 'titre de la page maternelle'
24
22
 
25
23
  contacts:
26
24
  sender_name: "nom de l'auteur"
27
25
  sender_email: "email de l'auteur"
28
26
  body: 'contenu du message'
27
+
28
+ comments:
29
+ author: 'auteur'
30
+ body: "texte"
31
+ locale: 'langue'
32
+ status: 'état'
29
33
 
30
34
  pages:
31
35
  author: 'auteur'
32
36
  create_new: 'créer une nouvelle page'
37
+ edit_this: 'modifier cette page'
38
+ home: "page d'accueil"
39
+ not_published_yet: 'Pas encore publiée'
40
+ publish: 'la publier'
33
41
  published: 'publiée ?'
42
+ unpublish: 'la depublier'
43
+ reorder_root_menus: 'réorganiser les menus racines'
34
44
 
35
45
  create:
36
46
  notice: 'La page a été créée.'
@@ -41,12 +51,59 @@ fr:
41
51
  destroy:
42
52
  notice: 'La page a été supprimée.'
43
53
  root_warning: "Vous ne pouvez pas supprimer cette page parce que c'est la page principale de bienvenue. Veuillez la modifier."
54
+ hint:
55
+ title: 'bien descriptif'
56
+ short_title: 'un seul mot si possible. On le voit dans les menus'
57
+ status:
58
+ changed:
59
+ published: 'La page a été publiée'
60
+ unpublished: "La publication de la page a été annulée. Elle est a nouveau en mode brouillon."
61
+ toggled: "Le status de blog ou non-blog a été modifié."
44
62
 
45
63
  contacts:
46
64
  messages_from_forms: 'messages du formulaire de contact'
47
65
  send_message: 'envoyez le message'
48
- sent: 'Envoyé le'
49
-
66
+ sent: 'Envoyé le'
50
67
  create:
68
+ did_not_reach: "Il y a eu un problem. Le message n'a pas été acheminé a sa destination."
69
+ invalid_email: 'Votre adresse courriel ne semble pas bonne !'
51
70
  notice: 'Votre message a bien été envoyé.'
52
71
  warning: "Il y'a eu un probleme en envoyant votre message."
72
+ mailer:
73
+ intro: 'Voici le message envoyé par un visiteur avec le formulaire de contact sur le site web :'
74
+ sender_name: "Nom de l'auteur :"
75
+ sender_email: "Adresse courriel de l'auteur :"
76
+ message: 'Message :'
77
+
78
+ comments:
79
+ login_needed: 'Vous devez être identifié pour fournir un commentaire'
80
+ sorted_by_oldest: 'Cette section va du plus vieux au plus recent pour vous permettre de modérer les commentaires du haut en bas.'
81
+ what_do_you_think: "Qu'en pensez vous ?"
82
+
83
+ create:
84
+ notice: 'Le commentaire a bien été créé.'
85
+ warning: "Il y a eu un problem et le commentaire n'a pas été sauvegardé"
86
+ update:
87
+ notice: 'Le commentaire a bien été mis a jour.'
88
+ warning: "Il y a eu un problem et le commentaire n'a pas été sauvegardé"
89
+ destroy:
90
+ notice: 'Le commentaire a été supprimé.'
91
+ moderation:
92
+ accept:
93
+ notice: 'Le commentaire a été accepté.'
94
+ warning: "Il y a eu un probleme dans la moderation de ce commentaire. Le changement n'a pas été sauvegardé."
95
+ block:
96
+ notice: "Le commentaire a été bloqué"
97
+ warning: "Il y a eu un probleme dans la moderation de ce commentaire. Le changement n'a pas été sauvegardé."
98
+ actions:
99
+ accept: "acceptez !"
100
+ block: "bloquez !"
101
+ status:
102
+ pending: 'en attente'
103
+ accepted: 'accepté'
104
+ blocked: 'bloqué'
105
+
106
+ blog:
107
+ itself: 'blog'
108
+ home: 'accueil du blog'
109
+ official: 'le blog officiel'
@@ -0,0 +1,109 @@
1
+ it:
2
+
3
+ activerecord:
4
+ models:
5
+ comment: 'comment'
6
+ comments: 'comments'
7
+ contact: 'contact'
8
+ contacts: 'contacts'
9
+ page: 'page'
10
+ pages: 'pages'
11
+ tag: 'tag'
12
+ tags: 'tags'
13
+
14
+ attributes:
15
+ pages:
16
+ title: "title"
17
+ short_title: 'short title'
18
+ description: "description"
19
+ body: "body text"
20
+ for_the_blog: 'for the blog'
21
+ parent_title: 'page parent title'
22
+
23
+ contacts:
24
+ sender_name: "sender name"
25
+ sender_email: 'sender email'
26
+ body: 'message'
27
+
28
+ comments:
29
+ author: 'author'
30
+ body: "body text"
31
+ locale: 'language'
32
+ status: 'status'
33
+
34
+ pages:
35
+ author: 'author'
36
+ create_new: 'create new page'
37
+ edit_this: 'edit this page'
38
+ home: 'home page'
39
+ not_published_yet: 'Not published yet'
40
+ publish: 'publish'
41
+ published: 'published?'
42
+ unpublish: 'unpublish'
43
+ reorder_root_menus: 'reorder root menu items'
44
+
45
+ create:
46
+ notice: 'The page was successfully created.'
47
+ warning: 'There was a problem saving the page'
48
+ update:
49
+ notice: 'The page was successfully updated.'
50
+ warning: 'There was a problem saving the page'
51
+ destroy:
52
+ notice: 'The page was deleted'
53
+ root_warning: "You cannot delete this page as this is the root page of the site. You should only modify it."
54
+ hint:
55
+ title: 'nice and descriptive'
56
+ short_title: 'ideally one word only, used for the menu'
57
+ status:
58
+ changed:
59
+ published: 'The page has been published'
60
+ unpublished: "The page has been unpublished. It's a draft again."
61
+ toggled: "The blog status of the page has been changed"
62
+
63
+ contacts:
64
+ messages_from_forms: 'messages from contact form'
65
+ send_message: 'send message'
66
+ sent: 'Sent at'
67
+ create:
68
+ did_not_reach: 'Something went wrong. Your message did not reach the intended recipient.'
69
+ invalid_email: 'Your email address does not seem to be valid!'
70
+ notice: 'Your message has been sent'
71
+ warning: 'There was a problem sending your message.'
72
+ mailer:
73
+ intro: 'Here is the message sent via the contact form on the web site:'
74
+ sender_name: "Sender's name:"
75
+ sender_email: "Sender's email:"
76
+ message: 'Message:'
77
+
78
+ comments:
79
+ login_needed: 'You need to be logged in to leave a comment'
80
+ sorted_by_oldest: 'This section is sorted by oldest comment first so that they can be moderated from top to bottom.'
81
+ what_do_you_think: 'What do you think?'
82
+
83
+ create:
84
+ notice: 'The comment was successfully created.'
85
+ warning: 'There was a problem saving the comment to the database'
86
+ update:
87
+ notice: 'The comment was successfully updated.'
88
+ warning: 'There was a problem saving this comment'
89
+ destroy:
90
+ notice: 'The comment was deleted'
91
+ moderation:
92
+ accept:
93
+ notice: "This comment has been accepted"
94
+ warning: "Some error occurred and the comment could not be moderated and accepted"
95
+ block:
96
+ notice: "This comment has been blocked"
97
+ warning: "Some error occurred and the comment could not be moderated and blocked"
98
+ actions:
99
+ accept: "accept!"
100
+ block: "block!"
101
+ status:
102
+ pending: 'pending'
103
+ accepted: 'accepted'
104
+ blocked: 'blocked'
105
+
106
+ blog:
107
+ itself: 'blog'
108
+ home: 'home blog'
109
+ official: 'the official blog'
@@ -1,3 +1,3 @@
1
1
  module TkhContent
2
- VERSION = "0.3.1"
2
+ VERSION = "0.4.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tkh_content
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.4.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-29 00:00:00.000000000 Z
12
+ date: 2013-02-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -176,23 +176,31 @@ files:
176
176
  - app/models/page.rb
177
177
  - app/models/tag.rb
178
178
  - app/models/tagging.rb
179
+ - app/views/blog/index.atom.builder
179
180
  - app/views/blog/index.html.erb
180
- - app/views/blog/index.rss.builder
181
181
  - app/views/comments/_form.html.erb
182
182
  - app/views/comments/_form_in_page.html.erb
183
183
  - app/views/comments/_list_of_comments.html.erb
184
184
  - app/views/comments/_status_buttons.html.erb
185
+ - app/views/comments/_tab_admin_menu.html.erb
186
+ - app/views/comments/accepted.html.erb
187
+ - app/views/comments/blocked.html.erb
185
188
  - app/views/comments/edit.html.erb
189
+ - app/views/comments/for_feed.atom.builder
186
190
  - app/views/comments/index.html.erb
191
+ - app/views/comments/pending.html.erb
187
192
  - app/views/contact_mailer/message_from_contact_form.text.erb
188
193
  - app/views/contacts/_form.html.erb
194
+ - app/views/contacts/_tab_admin_menu.html.erb
189
195
  - app/views/contacts/index.html.erb
196
+ - app/views/contacts/show.html.erb
190
197
  - app/views/pages/_admin_context_menu.html.erb
191
198
  - app/views/pages/_blog_post_meta.html.erb
192
199
  - app/views/pages/_comment_section.html.erb
193
200
  - app/views/pages/_form.html.erb
194
201
  - app/views/pages/_individual_blog_post_in_list.html.erb
195
202
  - app/views/pages/_new_comment_section.html.erb
203
+ - app/views/pages/_tab_admin_menu.html.erb
196
204
  - app/views/pages/edit.html.erb
197
205
  - app/views/pages/index.html.erb
198
206
  - app/views/pages/new.html.erb
@@ -206,6 +214,7 @@ files:
206
214
  - lib/generators/tkh_content/create_or_update_locales/templates/en.yml
207
215
  - lib/generators/tkh_content/create_or_update_locales/templates/es.yml
208
216
  - lib/generators/tkh_content/create_or_update_locales/templates/fr.yml
217
+ - lib/generators/tkh_content/create_or_update_locales/templates/it.yml
209
218
  - lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb
210
219
  - lib/generators/tkh_content/create_or_update_migrations/templates/add_author_to_pages.rb
211
220
  - lib/generators/tkh_content/create_or_update_migrations/templates/add_parent_id_to_pages.rb
@@ -267,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
267
276
  version: '0'
268
277
  segments:
269
278
  - 0
270
- hash: -2565218290423442964
279
+ hash: 2182247311172755603
271
280
  required_rubygems_version: !ruby/object:Gem::Requirement
272
281
  none: false
273
282
  requirements:
@@ -276,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
276
285
  version: '0'
277
286
  segments:
278
287
  - 0
279
- hash: -2565218290423442964
288
+ hash: 2182247311172755603
280
289
  requirements: []
281
290
  rubyforge_project:
282
291
  rubygems_version: 1.8.23
@@ -1,18 +0,0 @@
1
- xml.instruct! :xml, version: "1.0"
2
- xml.rss version: "2.0" do
3
- xml.channel do
4
- xml.title Setting.first.try(:blog_name)
5
- xml.description Setting.first.try(:blog_tagline)
6
- xml.link blog_url
7
-
8
- @posts.each do |post|
9
- xml.item do
10
- xml.title post.title
11
- xml.description post.body
12
- xml.pubDate post.published_at.to_s(:rfc822)
13
- xml.link page_url(post)
14
- xml.guid page_url(post)
15
- end
16
- end
17
- end
18
- end