hobo 1.3.0.pre25 → 1.3.0.pre26

data/VERSION

@@ -1 +1 @@
-1.3.0.pre25
+1.3.0.pre26

data/lib/generators/hobo/i18n/templates/app.de.yml

@@ -0,0 +1,30 @@
+# Hobo application translation file for German.
+# Translated by Matthias Wächter (matthias@waechter.wiz.at)
+
+# Please, add the specific models and attributes for your application.
+
+# If you find any error, or if you have any more specific translation,
+# please post it to http://hobousers.googlegroups.com. Thank you!
+
+de:
+
+  attributes:
+    created_at: Erzeugt
+    updated_at: Geändert
+
+  activerecord:
+    models:
+      user:
+        one: Benutzer
+        other: Benutzer
+    attributes:
+      user:
+        name: Name
+        password: Passwort
+        current_password: Derzeitiges Passwort
+        password_confirmation: Passwort Bestätigt
+        email_address: Email-Adresse
+    attribute_help:
+      user:
+        email_address: Ihre e-mail-Adresse wird nie an Andere weiter gegeben
+

data/lib/generators/hobo/i18n/templates/app.en.yml

@@ -17,6 +17,7 @@ en:
 #      user:
 #        name: Name
 #        password: Password
+#        current_password: Current Password
 #        password_confirmation: Password Confirmation
 #        email_address: Email Address
 #    attribute_help:

data/lib/generators/hobo/i18n/templates/app.es.yml

@@ -23,6 +23,7 @@ es:
       user:
         name: Nombre
         password: Contraseña
+        current_password: Contraseña Actual
         password_confirmation: Confirmación Contraseña
         email_address: Correo Electrónico
 #    attribute_help:

data/lib/generators/hobo/i18n/templates/app.it.yml

@@ -1,6 +1,9 @@
 # Hobo application translation file for Italian.
 # Please, add the specific models and attributes for your application.
 
+# If you find any error, or if you have any more specific translation,
+# please post it to http://hobousers.googlegroups.com. Thank you!
+
 it:
 
   attributes:
@@ -15,7 +18,8 @@ it:
     attributes:
       user:
         name: Nome
-        password: Parola chiave
+        password: Parola Chiave
+        current_password: Parola Chiave Attuale
         password_confirmation: Conferma Parola Chiave
         email_address: Indirizzo Elettronico
 #    attribute_help:

data/lib/generators/hobo/i18n/templates/app.pt-PT.yml

@@ -16,6 +16,7 @@
       user:
         name: Nome
         password: Palavra-chave
+        current_password: Palavra-chave actual
         password_confirmation: Confirmação da Palavra-chave
         email_address: Enderesso de correio electrônico
     attribute_help:

data/lib/generators/hobo/i18n/templates/app.ru.yml

@@ -16,6 +16,7 @@ ru:
       user:
         name: Имя
         password: Пароль
+        current_password: Текущий пароль
         password_confirmation: Подтверждение пароля
         email_address: Электронный адрес
 #    attribute_help:

data/lib/generators/hobo/i18n/templates/hobo.de.yml

@@ -0,0 +1,203 @@
+# Hobo internals translation file for German
+# Translated by Matthias Wächter (matthias@waechter.wiz.at)
+
+# If you find any error, please post it to http://hobousers.googlegroups.com.
+# Thank you!
+
+de:
+  hobo:
+    # default hobo pages translations
+    index:
+      # if you uncomment the following you will loose the automatic selection of dinamically pluralized nav-tabs
+      # if you need a different title you should implement a different way to select the tab on your own
+      #title: "%{model} Index"
+      heading: "%{model} Übersicht"
+
+    new:
+      title: "%{model} anlegen"
+      heading: "%{model} anlegen"
+
+    show:
+      title: "%{model}"
+      heading: "%{model} %{name}"
+      back_link: "Zurück"
+      edit_link: "%{model} bearbeiten"
+      new_link: "%{model} anlegen"
+      add_form_heading: "%{model} hinzufügen"
+
+    edit:
+      title: "%{model} bearbeiten"
+      heading: "%{model} bearbeiten"
+
+    index_for_owner:
+      title: "%{model} für"
+      # be aware that you will loose the automatic Your <collection> / Jom's <collection>
+      # default output for User models
+      # you better define the heading.* in the specific collection namespace
+      #heading:
+      subheading: "Für:"
+
+    new_for_owner:
+      title: "%{model} anlegen für"
+      heading: "%{model} anlegen"
+      subheading: "Für:"
+
+    login:
+      title: "Login"
+      heading: "Login"
+      email_address: &email_address "E-Mail-Adresse"
+      name: "Name"
+      password: "Passwort"
+      remember_me: "Remember me"
+      login: "Login"
+      signup: "Konto anlegen"
+      forgot_password: &forgot_password "Passwort vergessen?"
+
+    signup:
+      title: "Benutzerkonto anlegen"
+      heading: "Neuen Benutzer anlegen"
+
+    forgot_password:
+      title: *forgot_password
+      heading: *forgot_password
+      text: "Geben Sie die E-Mail-Adresse ein, die Sie bei der Anmeldung verwendet haben.
+             Im Anschluss erhalten Sie ein E-Mail, mit dem Sie Ihr Passwort zurücksetzen können."
+      email_address: *email_address
+      send: "Abschicken"
+
+    forgot_password_sent:
+      title: "Passwort vergessen – E-Mail abgeschickt"
+      heading: "Passwort vergessen – E-Mail abgeschickt"
+      text: "Es wurde ein E-Mail an %{email_address} verschickt, das Anweisungen zum Rücksetzen
+             des Passworts enthält. Wenn Sie es nicht erhalten, überprüfen Sie bitte Ihren
+             Spam-Filter."
+
+    account_disabled_page:
+      title: "Benutzerkonto deaktiviert"
+      heading: "Benutzerkonto deaktiviert"
+      text: "Ihr Benutzerkonto ist derzeit deaktiviert"
+
+    account_page:
+      title: "Ihr Benutzerkonto"
+      heading: "Ihr Benutzerkonto"
+      new_password: "Neues Passwort"
+      confirm_new_password: "Neues Passwort (wiederholen)"
+
+    # default hobo action translation
+    # The action with added model variable are new, create, delete, save,
+    # edit and back_to_parent
+    actions:
+      new: "%{model} anlegen"
+      create: "%{model} erzeugen"
+      previous: "Voriges"
+      next: "Nächstes"
+      add: "Hinzufügen"
+      show_all: "Alle anzeigen: %{model}"
+      delete: "%{model} löschen"
+      save: "%{model} speichern"
+      cancel: "Abbrechen"
+      edit: "%{model} bearbeiten"
+      back: "Zurück zu"
+      back_to_parent: "Zurück zu %{parent} %{name}"
+      send: "Abschicken"
+      remove: "Entfernen"
+      signup: "Konto anlegen"
+      login: "Anmelden"
+      logout: "Abmelden"
+      logged_in_as: "Angemeldet als %{name}"
+      account: "Benutzerkonto"
+      save_account: "Daten abspeichern"
+
+    # default hobo message translation
+    messages:
+      create:
+        success: "%{model} erfolgreich angelegt"
+        error: "%{model} konnte nicht angelegt werden.\n%{errors}"
+      creator:
+        error: "Konnte %{name}-Creator nicht ausführen.\n%{errors}"
+      transition:
+        error: "Konnte %{name}-Transition nicht ausführen.\n%{errors}"
+      update:
+        no_attribute_error: "Keine Aktualisierung in params spezifiziert"
+        success: "Änderungen an %{model} gesichert"
+        error: "Mit dieser Änderung gab es Probleme.\n%{errors}"
+      destroy:
+        success: "%{model} wurde gelöscht"
+      signup:
+        success: "Vielen Dank für Ihre Anmeldung!"
+        must_activate: "Sie müssen Ihr Konto erst aktivieren, bevor Sie sich damit anmelden können.
+                        Bitte schauen Sie in Ihr Postfach."
+      login:
+        success: "Sie haben sich angemeldet."
+        error: "You did not provide a valid %{login} and Password!"
+      logout: "Sie haben sich abgemeldet."
+      reset_password: "Ihr Passwort wurde zurückgesetzt."
+      permission_denied: "Zugriff verweigert"
+      not_found: "Die angeforderte Seite konnte nicht gefunden werden."
+      unauthenticated: "Sie konnten nicht Authentifiziert werden"
+      validate_password: "muss mindestens 6 Buchstaben lang sein und darf nicht nur aus
+                          Kleinbuchstaben bestehen"
+      current_password_is_not_correct: "ist nicht korrekt"
+      you_are_site_admin: "Sie sind jetzt der Administrator"
+      you_signed_up: "Sie haben sich angemeldet"
+      no: "Kein %{model}-Objekt gefunden."
+      confirm: "Sind Sie sich sicher?"
+
+    # default hobo collection translation
+    collection:
+      count: &collection_count
+        zero: &no_model "Kein %{model}-Objekt"
+        one: "Es gibt derzeit nur ein %{model}-Objekt"
+        other: "Es gibt bereits %{count} %{model}-Objekte"
+      # you can use the following to completely override the collection heading
+      # be aware that you will loose the automatic Your <collection> / Jom's <collection>
+      # default output for User models
+      # you better define the heading.* in the specific collection namespace
+      #heading:
+      add_form_heading: "%{model} hinzufügen"
+      empty_message: "Keine Enträge"
+
+    # default hobo form translation
+    form:
+      new:
+        heading: "%{model} anlegen"
+      error:
+        heading: "Die folgenden Fehler sind aufgetreten:"
+      select_many:
+        prompt: "%{model} anlegen"
+
+    # hobo support
+    support:
+      or: "oder"
+      a: "ein/e"
+      an: "ein/e"
+
+    table_plus:
+      search: "Suche"
+      submit_label: "Go"
+
+    live_search:
+      label: "Suche"
+      results_label: "Suchergebnisse"
+      close_button: "Schließen"
+      no_results: "Die Suche ergab keine Treffer."
+
+    dev_user_changer:
+      guest: "Gast"
+
+    admin:
+      subsite_name: "Admin"
+      invite_new_user: "Neuen Benutzer einladen"
+
+    subsite:
+      back_link: "Zur Hauptseite"
+
+    boolean_yes: "Ja"
+    boolean_no: "Nein"
+    password_hidden: "[Passwort versteckt]"
+
+    in_place_editor:
+      click_to_edit: "(Zum Bearbeiten anklicken)"
+
+    select_one_editor:
+      blank_message: *no_model

data/lib/generators/hobo/i18n/templates/hobo.en.yml

@@ -63,7 +63,7 @@ en:
     forgot_password_sent:
       title: "Forgotten password - E-mail sent"
       heading: "Forgotten password - E-mail sent"
-      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."
+      text: "An 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."
 
     account_disabled_page:
       title: "Account disabled"
@@ -137,7 +137,7 @@ en:
     # default hobo collection translation
     collection:
       count: &collection_count
-        zero: "No %{model}"
+        zero: &no_model "No %{model}"
         one: "There is only one %{model} at the moment"
         other: "There are already %{count} %{model}"
       # you can use the following to completely override the collection heading
@@ -155,7 +155,7 @@ en:
       error:
         heading: "The following error occured:"
       select_many:
-            prompt: "Add %{model}"
+        prompt: "Add %{model}"
 
     # hobo support
     support:
@@ -186,3 +186,9 @@ en:
     boolean_yes: "Yes"
     boolean_no: "No"
     password_hidden: "[password hidden]"
+
+    in_place_editor:
+      click_to_edit: "(click to edit)"
+
+    select_one_editor:
+      blank_message: *no_model

data/lib/generators/hobo/i18n/templates/hobo.es.yml

@@ -144,7 +144,7 @@ es:
     # default hobo collection translation
     collection:
       count: &collection_count
-        zero: "No hay %{model}"
+        zero: &no_model "No hay %{model}"
         one: "Hay solo 1 %{model}"
         other: "Hay %{count} %{model}"
       # you can use the following to completely override the collection heading
@@ -193,3 +193,9 @@ es:
     boolean_yes: "Si"
     boolean_no: "No"
     password_hidden: "[contraseña]"
+
+    in_place_editor:
+      click_to_edit: "(haga clic para editar)"
+
+    select_one_editor:
+      blank_message: *no_model

data/lib/generators/hobo/i18n/templates/hobo.it.yml

@@ -143,7 +143,7 @@ it:
     # default hobo collection translation
     collection:
       count: &collection_count
-        zero: "Non ci sono %{model}"
+        zero: &no_model "Non ci sono %{model}"
         one: "C'è solo 1 %{model}"
         other: "Ci sono %{count} %{model}"
 
@@ -193,3 +193,9 @@ it:
     boolean_yes: "Si"
     boolean_no: "No"
     password_hidden: "[parola chiave]"
+
+    in_place_editor:
+      click_to_edit: "cliccare per modificare"
+
+    select_one_editor:
+      blank_message: *no_model

data/lib/generators/hobo/i18n/templates/hobo.pt-PT.yml

@@ -138,9 +138,9 @@
     # default hobo collection translation
     collection:
       count: &collection_count
-        zero: "Não há %{model}s"
+        zero: &no_model "Não há %{model}"
         one: "Só existe um(a) #{model} do momento"
-        other: "Já existem %{count} %{model}s"
+        other: "Já existem %{count} %{model}"
       # you can use the following to completely override the collection heading
       # be aware that you will loose the automatic Your <collection> / Jom's <collection>
       # default output for User models
@@ -187,3 +187,9 @@
     boolean_yes: "Sim"
     boolean_no: "Não"
     password_hidden: "[palavra-chave]"
+
+    in_place_editor:
+      click_to_edit: "(clique para editar)"
+
+    select_one_editor:
+      blank_message: *no_model

data/lib/generators/hobo/i18n/templates/hobo.ru.yml

@@ -142,9 +142,9 @@ ru:
     # default hobo collection translation
     collection:
       count: &collection_count
-        zero: "Нет %{model}ей"
+        zero: &no_model "Нет %{model}"
         one: "В базе только одна %{model}."
-        other: "В базе %{count} %{model}ей"
+        other: "В базе %{count} %{model}"
       # you can use the following to completely override the collection heading
       # be aware that you will loose the automatic Your <collection> / Jom's <collection>
       # default output for User models
@@ -191,3 +191,9 @@ ru:
     boolean_yes: "Да"
     boolean_no: "Нет"
     password_hidden: "[пароль скрыт]"
+
+    in_place_editor:
+      click_to_edit: "(нажмите для изменения)"
+
+    select_one_editor:
+      blank_message: *no_model

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -122,7 +122,7 @@ EOI
     def dryml_only_templates_option
       if wizard?
         say_title 'Templates Option'
-        dryml_only_templates = yes_no?("Will you application use only hobo/dryml web page templates?\n(Choose 'n' only if you also plan to use plain rails/erb web page templates)")
+        dryml_only_templates = yes_no?("Will your application use only hobo/dryml web page templates?\n(Choose 'n' only if you also plan to use plain rails/erb web page templates)")
       else
         dryml_only_templates = options[:dryml_only_templates]
       end

data/lib/hobo/controller.rb

@@ -68,7 +68,7 @@ module Hobo
     end
 
 
-    def ajax_update_response(render_specs, results={})
+    def ajax_update_response(render_specs, results={}, options={})
       controller, action = controller_action_from_page_path
       identifier = view_context.view_paths.find( action,
                                                  controller,
@@ -77,7 +77,7 @@ module Hobo
       renderer = Dryml.page_renderer(view_context, identifier, [], controller)
 
       render :update do |page|
-        page << "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"
+        page << options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"
         for spec in render_specs
           function = spec[:function] || "_update"
           dom_id = spec[:id]
@@ -93,6 +93,7 @@ module Hobo
           end
         end
         page << renderer.part_contexts_storage if renderer
+        page << options[:postamble] if options[:postamble]
       end
     end
 

data/lib/hobo/rapid/helper.rb

@@ -106,7 +106,8 @@ module Hobo
 
 
       def in_place_editor(attributes, this=nil)
-        blank_message = attributes.delete(:blank_message) || "(click to edit)"
+        blank_message = attributes.delete(:blank_message) ||
+                        t('hobo.in_place_editor.click_to_edit', :default => '(click to edit)')
 
         attributes = add_classes(attributes, "in-place-edit", model_id_class(this_parent, this_field))
         attributes.update(:hobo_blank_message => blank_message,

data/lib/hobo/rapid/taglibs/rapid_editing.dryml

@@ -94,7 +94,7 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
   -->
 <def tag="select-one-editor" attrs="include-none, blank-message, sort, update, options"><%
   raise Hobo::Error.new("Not allowed to edit") unless can_edit?
-  blank_message ||= "(No #{this_type.name.to_s.titleize})"
+  blank_message ||= ht("#{this_type.name.to_s.underscore}.select_one_editor.blank_message", :count => 0, :default => "(No #{this_type.name.to_s.titleize})")
   options ||= this_field_reflection.klass.all.select {|x| can_view?(x)}.map {|x|
             [ name(:with => x, :no_wrapper => true), x.id ]
           }

data/lib/hobo/rapid/taglibs/rapid_forms.dryml

@@ -589,7 +589,7 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
       else
         fade = true if fade.nil?
         attributes[:value] = label
-        attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
+        attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: '#{confirm}'})"
         element(:input, attributes, nil, true, true)
       end
     end
@@ -780,8 +780,16 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
   -->
 <def tag="error-messages">
   <section class="error-messages" merge-attrs if="&this.errors.length > 0">
-    <h2 param="heading"><t key="activerecord.errors.template.header" model="&this.class.model_name.human" count="&this.errors.size"/></h2>
-    <t key="activerecord.errors.template.body"></t>
+    <h2 param="heading">
+      <t key="activerecord.errors.template.header" model="&this.class.model_name.human" count="&this.errors.size">
+        <%= model = this.class.model_name.human
+            count = this.errors.size
+        count==1 ? "1 error prohibited this #{model} from being saved" :
+                   "#{count} errors prohibited this #{model} from being saved"
+        %>
+      </t>
+    </h2>
+    <t key="activerecord.errors.template.body">There were problems with the following fields:</t>
     <ul param>
       <% this.errors.to_a.each do |message| -%>
       <li param><%= message %></li>

data/lib/hobo/rapid/taglibs/rapid_generics.dryml

@@ -20,7 +20,7 @@
 <def tag="empty-collection-message">
   <unless test="&this.member_class.nil?">
     <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
-      <ht key="#{this.member_class.to_s.underscore}.collection.empty_message">
+      <ht key="#{this.member_class.name.underscore}.collection.empty_message">
         No <collection-name/> to display
       </ht>
     </div>

data/lib/hobo/rapid/taglibs/rapid_plus.dryml

@@ -113,7 +113,7 @@ This tag assumes the controller has a `reorder` action and the model has a `posi
       <ht key="#{model_class.to_s.underscore}.actions.new">New <%= model_class.model_name.human %></ht>
     </a>
     <collection param/>
-    <unless test="&this.empty? || this.size <= model_class.count">
+    <unless test="&this.empty? || this.size == model_class.count">
       <a param="show-all"><ht key="#{model_class.to_s.underscore}.actions.show_all" count="100">Show all <%= name.pluralize.titleize %>...</ht></a>
     </unless>
   </section>

data/lib/hobo/rapid/taglibs/rapid_summary.dryml

@@ -34,18 +34,18 @@
 <!-- the git version currently in use -->
 <def tag="git-version" attrs="dir">
   <% dir=Rails.root if dir.blank? -%>
-  <%= Dir.chdir(dir) {`git rev-list "HEAD^..HEAD" --abbrev-commit --abbrev=7`} -%>
+  <%= Dir.chdir(dir) {`git rev-parse --verify HEAD --short=7`} -%>
 </def>
 
-<!-- returns 'clean' if there are no modified files, 'modified' otherwise. -->
+<!-- returns 'clean' if there are no modified or added files, 'dirty' otherwise. -->
 <def tag="git-clean" attrs="dir">
   <% dir=Rails.root if dir.blank? -%>
-  <%= Dir.chdir(dir) {`git ls-files -m`}.blank? ? "clean" : "modified"  -%>
+  <%= Dir.chdir(dir) {`git status -s`}.blank? ? "clean" : "dirty"  -%>
 </def>
 
 <!-- the time & date of the last commit -->
 <def tag="git-last-commit-time">
-  <%= `git log "HEAD^..HEAD" --pretty=format:%cD` -%>
+  <%= `git log -1 --format=%cD` -%>
 </def>
 
 <!-- calls `git-clean` or `svn-clean` as appropriate.  `svn-clean` not yet written. -->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637108445
+  hash: -1637108448
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre25
-  version: 1.3.0.pre25
+  - pre26
+  version: 1.3.0.pre26
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 -04:00
+date: 2011-01-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108445
+        hash: -1637108448
         segments: 
         - 1
         - 3
         - 0
-        - pre25
-        version: 1.3.0.pre25
+        - pre26
+        version: 1.3.0.pre26
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108445
+        hash: -1637108448
         segments: 
         - 1
         - 3
         - 0
-        - pre25
-        version: 1.3.0.pre25
+        - pre26
+        version: 1.3.0.pre26
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108445
+        hash: -1637108448
         segments: 
         - 1
         - 3
         - 0
-        - pre25
-        version: 1.3.0.pre25
+        - pre26
+        version: 1.3.0.pre26
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -193,11 +193,13 @@ files:
 - lib/generators/hobo/front_controller/templates/controller.rb.erb
 - lib/generators/hobo/front_controller/templates/index.dryml
 - lib/generators/hobo/i18n/i18n_generator.rb
+- lib/generators/hobo/i18n/templates/app.de.yml
 - lib/generators/hobo/i18n/templates/app.en.yml
 - lib/generators/hobo/i18n/templates/app.es.yml
 - lib/generators/hobo/i18n/templates/app.it.yml
 - lib/generators/hobo/i18n/templates/app.pt-PT.yml
 - lib/generators/hobo/i18n/templates/app.ru.yml
+- lib/generators/hobo/i18n/templates/hobo.de.yml
 - lib/generators/hobo/i18n/templates/hobo.en.yml
 - lib/generators/hobo/i18n/templates/hobo.es.yml
 - lib/generators/hobo/i18n/templates/hobo.it.yml