hobo 1.3.0.RC4 → 1.3.0.pre10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (155) hide show
  1. data/CHANGES.txt +234 -282
  2. data/Rakefile +3 -3
  3. data/VERSION +1 -1
  4. data/app/controllers/dev_controller.rb +2 -2
  5. data/bin/hobo +3 -3
  6. data/config/routes.rb +1 -1
  7. data/doctests/hobo/lifecycles.rdoctest +1 -0
  8. data/doctests/hobo/model.rdoctest +5 -0
  9. data/doctests/hobo/multi_model_forms.rdoctest +5 -4
  10. data/doctests/hobo/scopes.rdoctest +8 -11
  11. data/doctests/prepare_testapp.rb +1 -2
  12. data/hobo.gemspec +2 -2
  13. data/lib/generators/hobo/admin_subsite/admin_subsite_generator.rb +11 -5
  14. data/lib/generators/hobo/admin_subsite/templates/admin.css +2 -20
  15. data/lib/generators/hobo/admin_subsite/templates/admin_tag_injection.erb +1 -3
  16. data/lib/generators/hobo/admin_subsite/templates/controller.rb.erb +5 -5
  17. data/lib/generators/hobo/admin_subsite/templates/users_index.dryml +1 -3
  18. data/lib/generators/hobo/basic/basic_generator.rb +17 -0
  19. data/lib/generators/hobo/{assets → basic}/templates/application.css +0 -0
  20. data/lib/generators/hobo/{assets → basic}/templates/application.dryml.erb +1 -1
  21. data/lib/generators/hobo/{assets → basic}/templates/dryml-support.js +2 -2
  22. data/lib/generators/hobo/{assets → basic}/templates/en_injection.yml +0 -0
  23. data/lib/generators/hobo/{assets → basic}/templates/guest.rb +0 -0
  24. data/lib/generators/hobo/controller.rb +1 -6
  25. data/lib/generators/hobo/front_controller/front_controller_generator.rb +3 -2
  26. data/{app/views/dev → lib/generators/hobo/front_controller/templates}/summary.dryml +10 -7
  27. data/lib/generators/hobo/hints/hints_generator.rb +12 -0
  28. data/lib/generators/hobo/hints/templates/hints.rb.erb +5 -0
  29. data/lib/generators/hobo/hints/templates/model_injection.rb.erb +36 -0
  30. data/lib/generators/hobo/i18n/i18n_generator.rb +9 -1
  31. data/lib/generators/hobo/i18n/templates/app.en.yml +1 -1
  32. data/lib/generators/hobo/i18n/templates/app.es-DO.yml +24 -0
  33. data/lib/generators/hobo/i18n/templates/app.it.yml +1 -5
  34. data/lib/generators/hobo/i18n/templates/app.pt-PT.yml +0 -1
  35. data/lib/generators/hobo/i18n/templates/default_count_injection.rb +10 -0
  36. data/lib/generators/hobo/i18n/templates/hobo.en.yml +10 -26
  37. data/lib/generators/hobo/i18n/templates/{hobo.es.yml → hobo.es-DO.yml} +10 -27
  38. data/lib/generators/hobo/i18n/templates/hobo.it.yml +4 -20
  39. data/lib/generators/hobo/i18n/templates/hobo.pt-PT.yml +9 -25
  40. data/lib/generators/hobo/model.rb +13 -0
  41. data/lib/generators/hobo/model/USAGE +3 -2
  42. data/lib/generators/hobo/model/model_generator.rb +1 -2
  43. data/lib/generators/hobo/rapid/rapid_generator.rb +0 -2
  44. data/lib/generators/hobo/rapid/templates/hobo-rapid.js +93 -78
  45. data/lib/generators/hobo/rapid/templates/ie7-recalc.js +21 -21
  46. data/lib/generators/hobo/rapid/templates/lowpro.js +31 -31
  47. data/lib/generators/hobo/rapid/templates/reset.css +1 -1
  48. data/lib/generators/hobo/rapid/templates/themes/clean/public/stylesheets/clean.css +16 -17
  49. data/lib/generators/hobo/rapid/templates/themes/clean/public/stylesheets/rapid-ui.css +3 -3
  50. data/lib/generators/hobo/rapid/templates/themes/clean/views/clean.dryml +1 -1
  51. data/lib/generators/hobo/resource/resource_generator.rb +1 -1
  52. data/lib/generators/hobo/routes/router.rb +4 -4
  53. data/lib/generators/hobo/routes/routes_generator.rb +1 -12
  54. data/lib/generators/hobo/routes/templates/hobo_routes.rb.erb +1 -1
  55. data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb +43 -88
  56. data/lib/generators/hobo/subsite.rb +5 -18
  57. data/lib/generators/hobo/subsite/subsite_generator.rb +1 -1
  58. data/lib/generators/hobo/subsite/templates/controller.rb.erb +1 -1
  59. data/lib/generators/hobo/subsite_taglib/templates/taglib.dryml.erb +2 -2
  60. data/lib/generators/hobo/test_framework/test_framework_generator.rb +7 -7
  61. data/lib/generators/hobo/user_controller/templates/controller.rb.erb +3 -8
  62. data/lib/generators/hobo/user_mailer/templates/activation.erb +2 -2
  63. data/lib/generators/hobo/user_mailer/templates/forgot_password.erb +2 -2
  64. data/lib/generators/hobo/user_mailer/templates/invite.erb +2 -2
  65. data/lib/generators/hobo/user_mailer/templates/mailer.rb.erb +17 -10
  66. data/lib/generators/hobo/user_mailer/user_mailer_generator.rb +1 -1
  67. data/lib/generators/hobo/user_model/USAGE +9 -2
  68. data/lib/generators/hobo/user_model/user_model_generator.rb +1 -2
  69. data/lib/hobo.rb +7 -13
  70. data/lib/hobo/controller.rb +14 -21
  71. data/lib/hobo/controller/authentication_support.rb +23 -1
  72. data/lib/hobo/controller/model.rb +53 -48
  73. data/lib/hobo/controller/{user_base.rb → user.rb} +36 -47
  74. data/lib/hobo/engine.rb +11 -25
  75. data/lib/hobo/extensions/action_controller/hobo_methods.rb +1 -25
  76. data/lib/hobo/extensions/active_model/translation.rb +1 -1
  77. data/lib/hobo/extensions/active_record/{associations/collection.rb → association_collection.rb} +3 -12
  78. data/lib/hobo/extensions/active_record/{associations/proxy.rb → association_proxy.rb} +7 -6
  79. data/lib/hobo/extensions/active_record/association_reflection.rb +19 -0
  80. data/lib/hobo/extensions/active_record/hobo_methods.rb +1 -1
  81. data/lib/hobo/extensions/active_record/scopes.rb +31 -0
  82. data/lib/hobo/extensions/array.rb +1 -13
  83. data/lib/hobo/helper.rb +6 -27
  84. data/lib/hobo/helper/translations.rb +90 -39
  85. data/lib/hobo/model.rb +20 -72
  86. data/lib/hobo/model/lifecycles.rb +11 -12
  87. data/lib/hobo/model/lifecycles/lifecycle.rb +4 -12
  88. data/lib/hobo/model/lifecycles/transition.rb +0 -1
  89. data/lib/hobo/model/permissions.rb +3 -2
  90. data/lib/hobo/model/scopes/apply_scopes.rb +1 -1
  91. data/lib/hobo/model/scopes/automatic_scopes.rb +80 -78
  92. data/lib/hobo/model/{user_base.rb → user.rb} +7 -9
  93. data/lib/hobo/rapid/generators/rapid/cards.dryml.erb +2 -2
  94. data/lib/hobo/rapid/generators/rapid/forms.dryml.erb +4 -5
  95. data/lib/hobo/rapid/generators/rapid/pages.dryml.erb +27 -26
  96. data/lib/hobo/rapid/helper.rb +5 -10
  97. data/lib/hobo/rapid/taglibs/rapid.dryml +1 -1
  98. data/lib/hobo/rapid/taglibs/rapid_core.dryml +42 -72
  99. data/lib/hobo/rapid/taglibs/rapid_document_tags.dryml +2 -2
  100. data/lib/hobo/rapid/taglibs/rapid_editing.dryml +16 -36
  101. data/lib/hobo/rapid/taglibs/rapid_forms.dryml +49 -87
  102. data/lib/hobo/rapid/taglibs/rapid_generics.dryml +2 -2
  103. data/lib/hobo/rapid/taglibs/rapid_i18n.dryml +75 -50
  104. data/lib/hobo/rapid/taglibs/rapid_lifecycles.dryml +5 -7
  105. data/lib/hobo/rapid/taglibs/rapid_navigation.dryml +2 -2
  106. data/lib/hobo/rapid/taglibs/rapid_pages.dryml +7 -8
  107. data/lib/hobo/rapid/taglibs/rapid_plus.dryml +43 -66
  108. data/lib/hobo/rapid/taglibs/rapid_summary.dryml +45 -16
  109. data/lib/hobo/rapid/taglibs/rapid_translations.dryml +36 -0
  110. data/lib/hobo/rapid/taglibs/rapid_user_pages.dryml +8 -8
  111. data/lib/hobo/routes.rb +23 -22
  112. data/lib/hobo/view_hints.rb +101 -0
  113. data/test/irt/generators/admin_subsite.irt +1 -1
  114. data/test/irt/generators/{assets.irt → basic.irt} +2 -2
  115. data/test/irt/generators/front_controller.irt +4 -2
  116. data/test/irt/generators/partials/_subsite_taglib_variables.rb +1 -1
  117. data/test/irt/generators/subsite.irt +1 -1
  118. data/test/permissions/test_permissions.rb +103 -103
  119. metadata +108 -69
  120. data/lib/generators/hobo/admin_subsite/USAGE +0 -25
  121. data/lib/generators/hobo/admin_subsite/templates/application.dryml +0 -1
  122. data/lib/generators/hobo/assets/USAGE +0 -5
  123. data/lib/generators/hobo/assets/assets_generator.rb +0 -18
  124. data/lib/generators/hobo/assets/templates/dryml_taglibs_initializer.rb +0 -1
  125. data/lib/generators/hobo/controller/USAGE +0 -3
  126. data/lib/generators/hobo/i18n/USAGE +0 -3
  127. data/lib/generators/hobo/i18n/templates/app.de.yml +0 -30
  128. data/lib/generators/hobo/i18n/templates/app.es.yml +0 -31
  129. data/lib/generators/hobo/i18n/templates/app.fr.yml +0 -26
  130. data/lib/generators/hobo/i18n/templates/app.nb.yml +0 -25
  131. data/lib/generators/hobo/i18n/templates/app.ru.yml +0 -24
  132. data/lib/generators/hobo/i18n/templates/hobo.de.yml +0 -204
  133. data/lib/generators/hobo/i18n/templates/hobo.fr.yml +0 -195
  134. data/lib/generators/hobo/i18n/templates/hobo.nb.yml +0 -198
  135. data/lib/generators/hobo/i18n/templates/hobo.ru.yml +0 -200
  136. data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/100-ACD3E6-DBE1E5-H.png +0 -0
  137. data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/100-DBE1E5-FCFEF5-H.png +0 -0
  138. data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/300-3B5F87-ACD3E6-H.png +0 -0
  139. data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/spinner.gif +0 -0
  140. data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/stylesheets/clean-sidemenu.css +0 -81
  141. data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/views/clean-sidemenu.dryml +0 -30
  142. data/lib/generators/hobo/resource/USAGE +0 -39
  143. data/lib/generators/hobo/subsite/USAGE +0 -24
  144. data/lib/generators/hobo/subsite_taglib/USAGE +0 -4
  145. data/lib/generators/hobo/test_framework/USAGE +0 -2
  146. data/lib/generators/hobo/user_controller/USAGE +0 -3
  147. data/lib/generators/hobo/user_mailer/USAGE +0 -2
  148. data/lib/generators/hobo/user_resource/USAGE +0 -10
  149. data/lib/hobo/extensions/action_view/translation_helper.rb +0 -25
  150. data/lib/hobo/extensions/active_record/associations/reflection.rb +0 -23
  151. data/lib/hobo/extensions/active_record/associations/scope.rb +0 -35
  152. data/lib/hobo/extensions/active_record/relation_with_origin.rb +0 -32
  153. data/lib/hobo/extensions/i18n.rb +0 -17
  154. data/lib/hobo/helper/translations/normalizer.rb +0 -39
  155. data/lib/hobo/model/view_hints.rb +0 -123
@@ -0,0 +1,36 @@
1
+
2
+ hobo_model # Don't put anything above this
3
+
4
+ fields do
5
+ <% for attribute in field_attributes -%>
6
+ <%= "%-#{max_attribute_length}s" % attribute.name %> :<%= attribute.type %>
7
+ <% end -%>
8
+ timestamps
9
+ end
10
+
11
+ <% for bt in bts -%>
12
+ belongs_to :<%= bt %>
13
+ <% end -%>
14
+ <%= "\n" unless bts.empty? -%>
15
+ <% for hm in hms -%>
16
+ has_many :<%= hm %>, :dependent => :destroy
17
+ <% end -%>
18
+ <%= "\n" unless hms.empty? -%>
19
+ # --- Permissions --- #
20
+
21
+ def create_permitted?
22
+ acting_user.administrator?
23
+ end
24
+
25
+ def update_permitted?
26
+ acting_user.administrator?
27
+ end
28
+
29
+ def destroy_permitted?
30
+ acting_user.administrator?
31
+ end
32
+
33
+ def view_permitted?(field)
34
+ true
35
+ end
36
+
@@ -8,7 +8,7 @@ module Hobo
8
8
 
9
9
  argument :locales,
10
10
  :type => :array,
11
- :default => %w[en],
11
+ :default => ["en"],
12
12
  :banner => "en it ..."
13
13
 
14
14
  def check_supported_locales
@@ -31,5 +31,13 @@ module Hobo
31
31
  remove_file 'config/locales/en.yml'
32
32
  end
33
33
 
34
+ def add_default_count_helper
35
+ return if File.read('app/helpers/application_helper.rb') =~ /def default_count\b/
36
+ inject_into_file 'app/helpers/application_helper.rb',
37
+ File.read( File.expand_path('../templates/default_count_injection.rb', __FILE__)),
38
+ :after => "module ApplicationHelper\n"
39
+ end
40
+
41
+
34
42
  end
35
43
  end
@@ -15,9 +15,9 @@ en:
15
15
  # other: Users
16
16
  # attributes:
17
17
  # user:
18
+ # created_at: Created at
18
19
  # name: Name
19
20
  # password: Password
20
- # current_password: Current Password
21
21
  # password_confirmation: Password Confirmation
22
22
  # email_address: Email Address
23
23
  # attribute_help:
@@ -0,0 +1,24 @@
1
+ # Hobo application translation file for Spanish.
2
+ # Please, add the specific models and attributes for your application.
3
+
4
+ es:
5
+
6
+ attributes:
7
+ created_at: Creado el
8
+ updated_at: Actualizado el
9
+
10
+ activerecord:
11
+ models:
12
+ user:
13
+ one: Usuario
14
+ other: Ususarios
15
+ attributes:
16
+ user:
17
+ name: Nombre
18
+ password: Contraseña
19
+ password_confirmation: Confirmacción Contraseña
20
+ email_address: Correo Electronico
21
+ # attribute_help:
22
+ # user:
23
+ # email_address:
24
+
@@ -1,9 +1,6 @@
1
1
  # Hobo application translation file for Italian.
2
2
  # Please, add the specific models and attributes for your application.
3
3
 
4
- # If you find any error, or if you have any more specific translation,
5
- # please post it to http://hobousers.googlegroups.com. Thank you!
6
-
7
4
  it:
8
5
 
9
6
  attributes:
@@ -18,8 +15,7 @@ it:
18
15
  attributes:
19
16
  user:
20
17
  name: Nome
21
- password: Parola Chiave
22
- current_password: Parola Chiave Attuale
18
+ password: Parola chiave
23
19
  password_confirmation: Conferma Parola Chiave
24
20
  email_address: Indirizzo Elettronico
25
21
  # attribute_help:
@@ -16,7 +16,6 @@
16
16
  user:
17
17
  name: Nome
18
18
  password: Palavra-chave
19
- current_password: Palavra-chave actual
20
19
  password_confirmation: Confirmação da Palavra-chave
21
20
  email_address: Enderesso de correio electrônico
22
21
  attribute_help:
@@ -0,0 +1,10 @@
1
+
2
+ # the default_count is called from i18n tags in order to produce the right pluralization
3
+ # when no count is explicitly passed. It is normally used to generate a plural.
4
+ # You can return different integers according to the needs of different languages
5
+ # if you return the symbol :dynamic the count will be the model count
6
+ # so the tag output will be singular or plural depending on the record count
7
+ def default_count
8
+ 100 # fixed plural by default
9
+ end
10
+
@@ -3,7 +3,7 @@ en:
3
3
  hobo:
4
4
  # default hobo pages translations
5
5
  index:
6
- # if you uncomment the following you will loose the automatic selection of dynamically pluralized nav-tabs
6
+ # if you uncomment the following you will loose the automatic selection of dinamically pluralized nav-tabs
7
7
  # if you need a different title you should implement a different way to select the tab on your own
8
8
  #title: "%{model} Index"
9
9
  heading: "%{model} Index"
@@ -63,7 +63,7 @@ en:
63
63
  forgot_password_sent:
64
64
  title: "Forgotten password - E-mail sent"
65
65
  heading: "Forgotten password - E-mail sent"
66
- text: "An e-mail with instructions on how to generate a new password has been sent to %{email_address}. If you don't receive this e-mail please check your spam folder."
66
+ text: "En e-mail with instructions on how you generate a new password has been sent to %{email_address}. If you don't receive this e-mail please check your spamfilter."
67
67
 
68
68
  account_disabled_page:
69
69
  title: "Account disabled"
@@ -72,7 +72,7 @@ en:
72
72
 
73
73
  account_page:
74
74
  title: "Your Account"
75
- heading: "Your Account"
75
+ heading: "Your Accunt"
76
76
  new_password: "New Password"
77
77
  confirm_new_password: "Confirm New Password"
78
78
 
@@ -85,12 +85,11 @@ en:
85
85
  previous: "Previous"
86
86
  next: "Next"
87
87
  add: "Add"
88
- show_all: "Show all %{model}..."
88
+ show_all: "show all..."
89
89
  delete: "Delete %{model}"
90
90
  save: "Save %{model}"
91
91
  cancel: "Cancel"
92
92
  edit: "Edit %{model}"
93
- edit_control: "Edit"
94
93
  back: "Back to"
95
94
  back_to_parent: "Back to %{parent} %{name}"
96
95
  send: "Send"
@@ -128,19 +127,18 @@ en:
128
127
  permission_denied: "Permission Denied"
129
128
  not_found: "The page you requested cannot be found."
130
129
  unauthenticated: "Couldn't authenticate you"
131
- validate_password: "must be at least 6 characters long and must not consist solely of lowercase letters"
132
130
  current_password_is_not_correct: "is not correct"
133
131
  you_are_site_admin: "You are now the site administrator"
134
132
  you_signed_up: "You have signed up"
135
- none: "No %{model} available."
133
+ no: "No %{model} available."
136
134
  confirm: "Are you sure?"
137
135
 
138
136
  # default hobo collection translation
139
137
  collection:
140
138
  count: &collection_count
141
- zero: &no_model "No %{model}"
142
- one: "There is one %{model}."
143
- other: "There are %{count} %{model}."
139
+ zero: "No %{model}"
140
+ one: "There is only one %{model} at the moment"
141
+ other: "There are already %{count} %{model}"
144
142
  # you can use the following to completely override the collection heading
145
143
  # be aware that you will loose the automatic Your <collection> / Jom's <collection>
146
144
  # default output for User models
@@ -154,9 +152,9 @@ en:
154
152
  new:
155
153
  heading: "New %{model}"
156
154
  error:
157
- heading: "The following error occurred:"
155
+ heading: "The following error occured:"
158
156
  select_many:
159
- prompt: "Add %{model}"
157
+ prompt: "Add %{model}"
160
158
 
161
159
  # hobo support
162
160
  support:
@@ -177,19 +175,5 @@ en:
177
175
  dev_user_changer:
178
176
  guest: "Guest"
179
177
 
180
- admin:
181
- subsite_name: "Admin"
182
- invite_new_user: "Invite a new user"
183
-
184
- subsite:
185
- back_link: "View Site"
186
-
187
178
  boolean_yes: "Yes"
188
179
  boolean_no: "No"
189
- password_hidden: "[password hidden]"
190
-
191
- in_place_editor:
192
- click_to_edit: "(click to edit)"
193
-
194
- select_one_editor:
195
- blank_message: *no_model
@@ -1,12 +1,11 @@
1
- # Hobo internals translation file for Spanish (Mexico).
1
+ # Hobo internals translation file for Spanish (Dominican Republic).
2
2
  # Translated by Domizio Demichelis (dd.nexus@gmail.com)
3
- # Corrections by Ricardo Pacheco
4
3
 
5
4
  # This file might be used for other Latin America Spanish Countries without any change
6
5
  # It might be ok also for Spain. If you find any error, or if you have any more specific translation,
7
6
  # please post it to http://hobousers.googlegroups.com. Thank you!
8
7
 
9
- es:
8
+ "es-DO":
10
9
  hobo:
11
10
  # default hobo pages translations
12
11
  index:
@@ -63,8 +62,8 @@ es:
63
62
  forgot_password:
64
63
  title: *forgot_password
65
64
  heading: *forgot_password
66
- text: "Ingresa la dirección de tu Correo Eléctronico que utilizaste cuando te inscribiste.
67
- Te enviaremos un Correo Eléctronico que podrás utilizar para generar una nueva contraseña."
65
+ text: "Ingresa la dirección de tu Correo Eléctronico que utilizaste cuando te inscribste.
66
+ Te enviaremos un Correo Eléctronico que podras utilizar para generar una nueva contraseña."
68
67
  email_address: *email_address
69
68
  send: "Enviar"
70
69
 
@@ -90,14 +89,13 @@ es:
90
89
  new: "Nuevo Registro de %{model}"
91
90
  create: "Crear %{model}"
92
91
  previous: "Precedente"
93
- next: "Próxima"
92
+ next: "Proxima"
94
93
  add: "Añadir"
95
- show_all: "Muestra todos %{model}..."
94
+ show_all: "todos..."
96
95
  delete: "Borrar %{model}"
97
96
  save: "Guardar %{model}"
98
97
  cancel: "Cancelar"
99
98
  edit: "Actualizar %{model}"
100
- edit_control: "Actualizar"
101
99
  back: "Volver a"
102
100
  back_to_parent: "Volver a %{parent} %{name}"
103
101
  send: "Enviar"
@@ -129,23 +127,22 @@ es:
129
127
  must_activate: "Tiene que activar la cuenta antes de iniciar la sesión. Por favor verifique su correo eléctronico."
130
128
  login:
131
129
  success: "La sesión ha iniciado."
132
- error: "¡No se ingresaron %{login} y Contraseña válidos!"
130
+ error: "¡No se ingresaron %{login} y Contraseña validos!"
133
131
  logout: "La sesión ha terminado."
134
132
  reset_password: "Tu contraseña ha sido reiniciada."
135
133
  permission_denied: "¡Permiso denegado!"
136
- not_found: "La página solicitada no se encuentra."
134
+ not_found: "La pagina solicitada no se encuentra."
137
135
  unauthenticated: "No se pudo autenticar."
138
- validate_password: "debe contener tansiquiera 6 caracteres, letras mayúsculas y minúsculas"
139
136
  current_password_is_not_correct: "no está correcta"
140
137
  you_are_site_admin: "Ahora usted es el administrador del sitio."
141
138
  you_signed_up: "Usted se inscribió."
142
- none: "No hay %{model} disponibles."
139
+ no: "No hay %{model} disponibles."
143
140
  confirm: "¿Está seguro?"
144
141
 
145
142
  # default hobo collection translation
146
143
  collection:
147
144
  count: &collection_count
148
- zero: &no_model "No hay %{model}"
145
+ zero: "No hay %{model}"
149
146
  one: "Hay solo 1 %{model}"
150
147
  other: "Hay %{count} %{model}"
151
148
  # you can use the following to completely override the collection heading
@@ -184,19 +181,5 @@ es:
184
181
  dev_user_changer:
185
182
  guest: "Invitado"
186
183
 
187
- admin:
188
- subsite_name: "Administración"
189
- invite_new_user: "Invitar Nuevo Usuario"
190
-
191
- subsite:
192
- back_link: "Sitio Principal"
193
-
194
184
  boolean_yes: "Si"
195
185
  boolean_no: "No"
196
- password_hidden: "[contraseña]"
197
-
198
- in_place_editor:
199
- click_to_edit: "(haga clic para editar)"
200
-
201
- select_one_editor:
202
- blank_message: *no_model
@@ -52,7 +52,7 @@ it:
52
52
  remember_me: "Ricorda i miei dati"
53
53
  login: "Identificazione"
54
54
  signup: "Iscrizione"
55
- forgot_password: &forgot_password "Parola Chiave dimenticata?"
55
+ forgot_password: &forgot_password "Parola Chiave dimentivata?"
56
56
 
57
57
  signup:
58
58
  title: "Iscrizione"
@@ -91,12 +91,11 @@ it:
91
91
  previous: "Precedente"
92
92
  next: "Prossimo"
93
93
  add: "Aggiungere"
94
- show_all: "Mostra tutti..."
94
+ show_all: "vedi tutti..."
95
95
  delete: "Elimina %{model}"
96
96
  save: "Registra %{model}"
97
97
  cancel: "Annulla"
98
98
  edit: "Modifica %{model}"
99
- edit_control: "Modifica"
100
99
  back: "Ritorna a"
101
100
  back_to_parent: "Ritorna a %{parent} %{name}"
102
101
  send: "Invia"
@@ -134,17 +133,16 @@ it:
134
133
  permission_denied: "Permesso negato!"
135
134
  not_found: "La pagina richiesta non è stata trovata."
136
135
  unauthenticated: "La tua utenticazione è fallita."
137
- validate_password: "deve contenere almeno 6 caratteri, sia maiuscoli che minuscoli"
138
136
  current_password_is_not_correct: "non è esatta"
139
137
  you_are_site_admin: "Adesso sei amministratore del sito."
140
138
  you_signed_up: "Ti sei iscritto."
141
- none: "Nessun record %{model} disponibile."
139
+ no: "Nessun record %{model} disponibile."
142
140
  confirm: "Sei sicuro?"
143
141
 
144
142
  # default hobo collection translation
145
143
  collection:
146
144
  count: &collection_count
147
- zero: &no_model "Non ci sono %{model}"
145
+ zero: "Non ci sono %{model}"
148
146
  one: "C'è solo 1 %{model}"
149
147
  other: "Ci sono %{count} %{model}"
150
148
 
@@ -184,19 +182,5 @@ it:
184
182
  dev_user_changer:
185
183
  guest: "Invitato"
186
184
 
187
- admin:
188
- subsite_name: "Amministrazione"
189
- invite_new_user: "Invita Nuovo Utente"
190
-
191
- subsite:
192
- back_link: "Sito Principale"
193
-
194
185
  boolean_yes: "Si"
195
186
  boolean_no: "No"
196
- password_hidden: "[parola chiave]"
197
-
198
- in_place_editor:
199
- click_to_edit: "cliccare per modificare"
200
-
201
- select_one_editor:
202
- blank_message: *no_model
@@ -50,7 +50,7 @@
50
50
  email_address: &email_address "E-mail"
51
51
  name: "Name"
52
52
  password: "Palavra-chave"
53
- remember_me: "Gravar Login"
53
+ remember_me: "Recordar-se de mim"
54
54
  login: "Login"
55
55
  signup: "Resgistar"
56
56
  forgot_password: &forgot_password "Esqueceu-se da senha?"
@@ -63,14 +63,14 @@
63
63
  forgot_password:
64
64
  title: *forgot_password
65
65
  heading: *forgot_password
66
- text: "Introduza o seu endereço de e-mail, o mesmo com que se registou. Vamos enviar uma mensagem para recuperar a palavra-chave."
66
+ text: "Introduza o seu endereço de e-mail, o mesmo com que se registou. Vamos enviar um endereço para gerar uma palavra-chave."
67
67
  email: "E-mail"
68
68
  send: "Enviar"
69
69
 
70
70
  forgot_password_sent:
71
71
  title: "Recuperação da palavra-chave - e-mail enviado"
72
72
  heading: "Recuperação da palavra-chave - e-mail enviado"
73
- text: "Foi enviada uma mensagem para %{email_address} com as instruções de como gerar uma nova palavra-chave. Se não o receber, por favor verifique o filtro de SPAM."
73
+ text: "Foram enviadas para o e-mail %{email_address} as instruções de como gerar uma nova palavra-chave. Se não o receber, por favor verifique o filtro de spam."
74
74
 
75
75
  account_disabled:
76
76
  title: "Conta não encontrada"
@@ -86,12 +86,11 @@
86
86
  previous: "Anterior"
87
87
  next: "Seguinte"
88
88
  add: "Adicionar"
89
- show_all: "Mostrar tudo %{model}..."
89
+ show_all: "mostrar tudo..."
90
90
  delete: "Apagar %{model}"
91
91
  save: "Gravar %{model}"
92
92
  cancel: "Cancelar"
93
93
  edit: "Editar %{model}"
94
- edit_control: "Editar"
95
94
  back: "Voltar para"
96
95
  back_to_parent: "Voltar para %{parent} %{name}"
97
96
  send: "Enviar"
@@ -120,28 +119,27 @@
120
119
  success: "O %{model} foi removido"
121
120
  signup:
122
121
  success: "Obrigado por efectuar o registo!"
123
- must_activate: "Deve ativar o seu registo antes de se identificar. Por favor, verifique na sua caixa de correio electrônico."
122
+ must_activate: "Deve ativar o seu registo antes de se identificar. Por favor, verifique na sua caixa de correio electrônico.
124
123
  login:
125
- success: "Está identificado no sistema."
124
+ success: "Está indetificado no sistema."
126
125
  error: "Não especificou um utilizador válido ({{login}}) e respectiva palavra-chave!"
127
126
  logout: "Saiu do sistema."
128
127
  reset_password: "A sua palavra-chave foi apagada."
129
128
  permission_denied: "Sem autorização!"
130
129
  not_found: "A página solicitada não foi encontrada"
131
130
  unauthenticated: "Não foi possível indentificá-lo(a)."
132
- validate_password: "tem que ter pelo menos 6 caracteres, letras maiúsculas e minúsculas"
133
131
  current_password_is_not_correct: "não está correta."
134
132
  you_are_site_admin: "Agora é o administrador do site"
135
133
  you_signed_up: "Acabou de se registar"
136
- none: "Nenhum #{model} disponível."
134
+ no: "Nenhum #{model} disponível."
137
135
  confirm: "Tem a certeza?"
138
136
 
139
137
  # default hobo collection translation
140
138
  collection:
141
139
  count: &collection_count
142
- zero: &no_model "Não há %{model}"
140
+ zero: "Não há %{model}s"
143
141
  one: "Só existe um(a) #{model} do momento"
144
- other: "Já existem %{count} %{model}"
142
+ other: "Já existem %{count} %{model}s"
145
143
  # you can use the following to completely override the collection heading
146
144
  # be aware that you will loose the automatic Your <collection> / Jom's <collection>
147
145
  # default output for User models
@@ -178,19 +176,5 @@
178
176
  dev_user_changer:
179
177
  guest: "Visitante"
180
178
 
181
- admin:
182
- subsite_name: "Administração"
183
- invite_new_user: "Convidar Novo Utilizador"
184
-
185
- subsite:
186
- back_link: "Sítio Principal"
187
-
188
179
  boolean_yes: "Sim"
189
180
  boolean_no: "Não"
190
- password_hidden: "[palavra-chave]"
191
-
192
- in_place_editor:
193
- click_to_edit: "(clique para editar)"
194
-
195
- select_one_editor:
196
- blank_message: *no_model