muck-engine 0.1.30 → 0.1.31

data/VERSION

@@ -1 +1 @@
-0.1.30
+0.1.31

data/app/helpers/muck_engine_helper.rb

@@ -75,7 +75,7 @@ module MuckEngineHelper
   # This makes the link usable even if javascript is disabled
   # See: http://www.intridea.com/2007/11/21/link_to_remote-unobtrusively
   def link_to_remote(name, options = {}, html_options = {})  
-    html_options.merge!({:href => url_for(options[:url])}) unless options[:url].blank?  
+    html_options.merge!({:href => url_for(options[:url])}) unless options[:url].blank?
     super(name, options, html_options)  
   end
   
@@ -83,13 +83,13 @@ module MuckEngineHelper
     link_to name, request.protocol + locale + '.' + request.domain + request.request_uri
     #link_to name, request.url.gsub(request.protocol, "#{request.protocol}#{locale}.")
     #link_to name, request.url.sub(request.protocol, "#{request.protocol}#{locale}.").sub('www.','')
-    # protocol = request.protocol
-    # if request.domain.count('.') == 1
-    #   new_domain = request.url.sub(protocol, "#{protocol}#{locale}.")
-    # else
-    #   new_domain = request.url.sub(Regexp.new(protocol + "[^\.]+."), "#{protocol}#{locale}.")
-    # end
-    # link_to name, new_domain
+    protocol = request.protocol
+    if request.domain.count('.') == 1
+      new_domain = request.url.sub(protocol, "#{protocol}#{locale}.")
+    else
+      new_domain = request.url.sub(Regexp.new(protocol + "[^\.]+."), "#{protocol}#{locale}.")
+    end
+    link_to name, new_domain
   end
 
   # Generate parameters for a url that refer to a given object as parent.  Useful
@@ -155,4 +155,9 @@ module MuckEngineHelper
     words[0..(length-1)].join(' ') + (words.length > length ? end_string : '')
   end
   
+  # Outputs a javascript include localized for specific time actions
+  def time_scripts(locale)
+    render :partial => 'scripts/time_scripts', :locals => {:locale => locale}
+  end
+
 end

data/app/views/scripts/_time_scripts.html.erb

@@ -0,0 +1,3 @@
+<% content_for :head do -%>
+  <%= javascript_include_tag "muck_time/#{locale}.js" %>
+<% end -%>

data/app/views/shared/_delete.html.erb

@@ -1,11 +1,15 @@
 <% if button_type == :text -%>
-  <%= link_to_remote( button_text, :url => delete_path, :method => :delete) %>
+  <%= link_to_remote( button_text, :url => delete_path, :method => :delete, :html => { :class  => 'muck_ajax_delete_control' }) %>
 <% else -%>
   <% remote_form_for(delete_object, :url => delete_path, :html => { :class => "delete-form #{form_class}", :method => :delete } ) do |f| -%>
     <% if button_type == :image -%>
-      <%= image_submit_tag '/images/icons/delete.png', {:title => button_text, :width => '15', :height => '15', :alt => button_text } %>
+      <%= image_submit_tag '/images/icons/delete.png', :title => button_text, :width => '15', :height => '15', :alt => button_text, :class  => 'muck_ajax_delete_control' %>
     <% else -%>
-      <%= submit_tag button_text, { :title => button_text } %>
+      <%= submit_tag button_text, :title => button_text, :class  => 'muck_ajax_delete_control' %>
     <% end -%>
   <% end -%>
+<% end -%>
+<% unless defined?(@delete_waiting_text_inserted) -%>
+  <div id="muck_ajax_delete_control_message" style="display:none;"><span class="waiting"><%= t('muck.general.deleting') %></span></div>
+  <% @delete_waiting_text_inserted = true%>
 <% end -%>

data/lib/action_controller/muck_application.rb

@@ -113,8 +113,8 @@ module ActionController
       
       # Attempts to create an @parent object using params
       # or the url.
-      def setup_parent
-        @parent = get_parent
+      def setup_parent(*ignore)
+        @parent = get_parent(ignore)
         if @parent.blank?
           render :text => t('muck.engine.missing_parent_error')
           return false
@@ -123,9 +123,12 @@ module ActionController
 
       # Tries to get parent using parent_type and parent_id from the url.
       # If that fails and attempt is then made using find_parent
-      def get_parent
+      # parameters:
+      # ignore: Names to ignore.  For example if the url is /foo/1/bar?thing_id=1
+      #         you might want to ignore thing_id so pass :thing.
+      def get_parent(*ignore)
         if params[:parent_type].blank? || params[:parent_id].blank?
-          find_parent
+          find_parent(ignore)
         else
           klass = params[:parent_type].to_s.constantize
           klass.find(params[:parent_id])
@@ -134,10 +137,16 @@ module ActionController
 
       # Searches the params to try and find an entry ending with _id
       # ie article_id, user_id, etc.  Will return the first value found.
-      def find_parent
+      # parameters:
+      # ignore: Names to ignore.  For example if the url is /foo/1/bar?thing_id=1
+      #         you might want to ignore thing_id so pass 'thing' to be ignored.
+      def find_parent(*ignore)
+        ignore.flatten!
         params.each do |name, value|
           if name =~ /(.+)_id$/
-            return $1.classify.constantize.find(value)
+            if !ignore.include?($1)
+              return $1.classify.constantize.find(value)
+            end
           end
         end
         nil

data/lib/muck_engine/tasks.rb

@@ -17,6 +17,8 @@ class MuckEngine
           desc "Sync files from muck engine."
           task :sync do
             path = File.join(File.dirname(__FILE__), *%w[.. ..])
+            # FileUtils.cp_r "#{path}/db", ".", :verbose => true, :remove_destination => true
+            # FileUtils.cp_r "#{path}/public", ".", :verbose => true, :remove_destination => true
             system "rsync -ruv #{path}/db ."
             system "rsync -ruv #{path}/public ."
           end

data/locales/ar.yml

@@ -5,27 +5,28 @@ ar:
       choose_country: "اختيار البلد"
       choose_language: "اختيار اللغة"
       choose_state: "اختيار الدولة"
-      missing_parent_error: "يرجى تحديد وجوه أحد الوالدين"
+      missing_parent_error: "يرجى تحديد الكائن الأصل"
       select_country_prompt: "الرجاء اختيار بلد"
-      select_language_prompt: "الرجاء اختيار اللغة"
+      select_language_prompt: "الرجاء اختيار لغة"
       select_state_prompt: "الرجاء اختيار الدولة"
     forms: 
-      please_enter_a_value: "الرجاء إدخال قيمة {{label}}"
+      please_enter_a_value: "الرجاء إدخال قيمة ل{{label}}"
     general: 
       activate: تفعيل
-      deactivate: تعطيل
+      deactivate: إيقاف
       delete: حذف
+      deleting: حذف...
       disable: يمكن
       enable: يعطل
       enabled: مكن؟
-      general_info: "معلومات اضافية"
+      general_info: "معلومات عامة"
       help: مساعدة
-      next: "التالي »"
+      next: "القادم »"
       no_text: لا
       previous: «السابق
-      read_more: "اقرأ المزيد"
+      read_more: "أقرأ المزيد"
       save: حفظ
-      settings_saved: "تم حفظ الإعدادات."
-      time_ago: "قبل {{time_in_words}}"
+      settings_saved: "لقد تم حفظ إعدادات."
+      time_ago: "منذ {{time_in_words}}"
       update: تحديث
       yes_text: نعم

data/locales/bg.yml

@@ -5,27 +5,28 @@ bg:
       choose_country: "Изберете Държава"
       choose_language: "Изберете език"
       choose_state: "Изберете държава"
-      missing_parent_error: "Моля, посочете майка обект"
+      missing_parent_error: "Моля, посочете обект майка"
       select_country_prompt: "Моля изберете страна"
       select_language_prompt: "Моля изберете език"
-      select_state_prompt: "Моля изберете една държава"
+      select_state_prompt: "Изберете държава"
     forms: 
       please_enter_a_value: "Моля, въведете стойност за {{label}}"
     general: 
       activate: Активиране
       deactivate: Деактивиране
       delete: Изтривам
+      deleting: "Изтриването на ..."
       disable: Включвам
       enable: Изключвам
-      enabled: "Позволено ли?"
+      enabled: "Е включен?"
       general_info: "Обща информация"
       help: Помощ
-      next: "Напред »"
+      next: "Следваща »"
       no_text: Не
       previous: «Назад
       read_more: "прочети повече"
       save: Спасявам
-      settings_saved: "Настройките са били спасени."
+      settings_saved: "Настройките са запазени."
       time_ago: "{{time_in_words}} Назад"
       update: Актуализирам
       yes_text: Да

data/locales/ca.yml

@@ -2,12 +2,12 @@
 ca: 
   muck: 
     engine: 
-      choose_country: "Seleccioneu País"
-      choose_language: "Seleccionar Idioma"
-      choose_state: "Seleccioneu Estat"
-      missing_parent_error: "Si us plau, especifiqueu un objecte pare"
-      select_country_prompt: "Si us plau seleccioni un país"
-      select_language_prompt: "Si us plau seleccioni un idioma"
+      choose_country: "Selecciona país"
+      choose_language: "Choose Language"
+      choose_state: "Esculli Estat"
+      missing_parent_error: "Si us plau, especifiqueu un objecte primari"
+      select_country_prompt: "Si us plau seleccioneu un país"
+      select_language_prompt: "Si us plau, seleccioneu un idioma"
       select_state_prompt: "Si us plau, seleccioneu un estat"
     forms: 
       please_enter_a_value: "Si us plau, introduïu un valor per {{label}}"
@@ -15,6 +15,7 @@ ca:
       activate: Activar
       deactivate: Desactivar
       delete: Esborrar
+      deleting: "Eliminar ..."
       disable: Possibilitar
       enable: Desactivar
       enabled: Activat?
@@ -23,9 +24,9 @@ ca:
       next: "Següent »"
       no_text: "No"
       previous: «Anterior
-      read_more: "llegeix més"
+      read_more: "Llegir més"
       save: Salvar
-      settings_saved: "S'han desat."
+      settings_saved: "Valors s'han desat."
       time_ago: "{{time_in_words}} Fa"
       update: Actualitzar
       yes_text: Sí

data/locales/cs.yml

@@ -3,11 +3,11 @@ cs:
   muck: 
     engine: 
       choose_country: "Vyberte zemi"
-      choose_language: "Vyberte jazyk"
+      choose_language: "Vybrat jazyk"
       choose_state: "Vyberte si stát"
-      missing_parent_error: "Prosíme, uveďte mateřský objekt"
-      select_country_prompt: "Vyberte zemi"
-      select_language_prompt: "Prosím zvolte jazyk"
+      missing_parent_error: "Prosím, zadejte nadřazeného objektu"
+      select_country_prompt: "Prosím vyberte zemi"
+      select_language_prompt: "Prosím, vyberte jazyk"
       select_state_prompt: "Prosím, vyberte stav"
     forms: 
       please_enter_a_value: "Prosím, zadejte hodnotu pro {{label}}"
@@ -15,15 +15,16 @@ cs:
       activate: Aktivovat
       deactivate: Deaktivovat
       delete: Odstranit
+      deleting: "Mazání ..."
       disable: Umožnit
       enable: Znemožnit
       enabled: Povoleno?
-      general_info: "Všeobecné info"
+      general_info: "Obecné info"
       help: Nápověda
       next: "Další »"
       no_text: Ne
       previous: «Předchozí
-      read_more: "čtěte více"
+      read_more: více
       save: Uložit
       settings_saved: "Nastavení bylo uloženo."
       time_ago: "{{time_in_words}} Ago"

data/locales/da.yml

@@ -8,13 +8,14 @@ da:
       missing_parent_error: "Angiv en forælder objekt"
       select_country_prompt: "Vælg et land"
       select_language_prompt: "Vælg et sprog"
-      select_state_prompt: "Vælg en stat"
+      select_state_prompt: "Vælg en tilstand"
     forms: 
       please_enter_a_value: "Angiv en værdi for {{label}}"
     general: 
-      activate: Aktivér
+      activate: Aktiver
       deactivate: Deaktiver
       delete: Slet
+      deleting: "Sletning af ..."
       disable: Aktivere
       enable: Deaktivere
       enabled: Aktiveret?

data/locales/de.yml

@@ -5,7 +5,7 @@ de:
       choose_country: "Land wählen"
       choose_language: "Choose Language"
       choose_state: "Wählen Sie Staat"
-      missing_parent_error: "Bitte geben Sie ein Objekt"
+      missing_parent_error: "Bitte geben Sie eine übergeordnete Objekt"
       select_country_prompt: "Bitte wählen Sie ein Land"
       select_language_prompt: "Bitte wählen Sie eine Sprache"
       select_state_prompt: "Bitte wählen Sie einen Staat"
@@ -15,9 +15,10 @@ de:
       activate: Aktivieren
       deactivate: Deaktivieren
       delete: Löschen
+      deleting: "Löschen ..."
       disable: Aktivieren
       enable: Deaktivieren
-      enabled: Aktiv?
+      enabled: Aktiviert?
       general_info: "Allgemeine Infos"
       help: Hilfe
       next: "Weiter »"
@@ -25,7 +26,7 @@ de:
       previous: «Zurück
       read_more: "Lesen Sie mehr"
       save: Sichern
-      settings_saved: "Einstellungen gespeichert wurden."
+      settings_saved: "Die Einstellungen wurden gespeichert."
       time_ago: "{{time_in_words}} Vor"
       update: Aktualisieren
       yes_text: Ja

data/locales/el.yml

@@ -3,18 +3,19 @@ el:
   muck: 
     engine: 
       choose_country: "Επιλέξτε Χώρα"
-      choose_language: "Επιλέξτε γλώσσα"
+      choose_language: "Επιλέξτε Γλώσσα"
       choose_state: "Επιλέξτε μέλος"
-      missing_parent_error: "Να αναφερθεί η μητρική αντικείμενο"
-      select_country_prompt: "Επιλέξτε μια χώρα"
+      missing_parent_error: "Να αναφερθεί ένα αντικείμενο μητρική"
+      select_country_prompt: "Παρακαλώ επιλέξτε μια χώρα"
       select_language_prompt: "Παρακαλώ επιλέξτε μια γλώσσα"
-      select_state_prompt: "Παρακαλούμε επιλέξτε ένα κράτος"
+      select_state_prompt: "Παρακαλώ επιλέξτε ένα κράτος"
     forms: 
       please_enter_a_value: "Παρακαλώ εισάγετε μια τιμή για {{label}}"
     general: 
       activate: Ενεργοποίηση
       deactivate: Απενεργοποίηση
       delete: Διαγράφω
+      deleting: "Διαγραφή ..."
       disable: Ενεργοποιώ
       enable: Απενεργοποιώ
       enabled: Ενεργοποιήθηκε;
@@ -22,10 +23,10 @@ el:
       help: Βοήθεια
       next: "Επόμενη »"
       no_text: Δεν
-      previous: «Προηγούμενη
+      previous: «Προηγούμενο
       read_more: "διαβάστε περισσότερα"
       save: Αποθηκεύω
-      settings_saved: "Ρυθμίσεις έχουν αποθηκευτεί."
+      settings_saved: "Ρυθμίσεις έχουν σωθεί."
       time_ago: "{{time_in_words}} Πριν"
       update: Ενημέρωση
       yes_text: Ναι

data/locales/en.yml

@@ -20,6 +20,7 @@ en:
       next: 'Next »'
       time_ago: "{{time_in_words}} ago"
       read_more: "read more"
+      deleting: "Deleting..."
     engine:
       choose_country: "Choose Country"
       select_country_prompt: "Please select a country"

data/locales/es.yml

@@ -2,12 +2,12 @@
 es: 
   muck: 
     engine: 
-      choose_country: "Seleccione País"
-      choose_language: "Seleccione Idioma"
-      choose_state: "Seleccione Estado"
-      missing_parent_error: "Por favor, especifique un objeto padre"
+      choose_country: "Seleccionar país"
+      choose_language: "Choose Language"
+      choose_state: "Escoja Estado"
+      missing_parent_error: "Por favor, especifique un objeto primario"
       select_country_prompt: "Por favor seleccione un país"
-      select_language_prompt: "Por favor seleccione un idioma"
+      select_language_prompt: "Por favor, seleccione un idioma"
       select_state_prompt: "Por favor, seleccione un estado"
     forms: 
       please_enter_a_value: "Por favor, introduzca un valor para {{label}}"
@@ -15,6 +15,7 @@ es:
       activate: Activar
       deactivate: Desactivar
       delete: Borrar
+      deleting: "Eliminar ..."
       disable: Posibilitar
       enable: Desactivar
       enabled: Activado?
@@ -23,9 +24,9 @@ es:
       next: "Siguiente »"
       no_text: "No"
       previous: «Anterior
-      read_more: "leer más"
+      read_more: "Leer más"
       save: Salvar
-      settings_saved: "Se han guardado."
+      settings_saved: "Valores se han guardado."
       time_ago: "{{time_in_words}} Hace"
       update: Actualizar
       yes_text: Sí

data/locales/et.yml

@@ -8,17 +8,18 @@ et:
       missing_parent_error: "Palun täpsustage vanem objekti"
       select_country_prompt: "Palun vali riik"
       select_language_prompt: "Palun valige keel"
-      select_state_prompt: "Vali riik"
+      select_state_prompt: "Palun valige riik"
     forms: 
       please_enter_a_value: "Palun sisestage väärtus {{label}}"
     general: 
       activate: Aktiveeri
-      deactivate: Deaktiveeri
+      deactivate: Tühista
       delete: Kustutama
+      deleting: "Kustutamine ..."
       disable: Võimaldama
       enable: Vigastama
-      enabled: Enabled?
-      general_info: Üldteave
+      enabled: Olemas?
+      general_info: "Üldine info"
       help: Abi
       next: "Järgmine »"
       no_text: Ei

data/locales/fa.yml

@@ -5,25 +5,26 @@ fa:
       choose_country: "انتخاب کشور"
       choose_language: "انتخاب زبان"
       choose_state: "استان را انتخاب کنید"
-      missing_parent_error: "لطفا یک شیء پدر و مادر را مشخص"
-      select_country_prompt: "لطفا یک کشور را انتخاب کنید"
+      missing_parent_error: "لطفا یک شی را مشخص کنید پدر یا مادر"
+      select_country_prompt: "لطفا کشور را انتخاب کنید"
       select_language_prompt: "لطفا یک زبان را انتخاب کنید"
       select_state_prompt: "لطفا یک حالت را انتخاب کنید"
     forms: 
       please_enter_a_value: "لطفا یک مقدار برای {{label}}را وارد کنید"
     general: 
       activate: فعال
-      deactivate: "بی خاصیت کردن"
+      deactivate: "غیر فعال کردن"
       delete: حذف
+      deleting: حذف...
       disable: فعال
       enable: "غیر فعال کردن"
-      enabled: "را فعال کنید؟"
+      enabled: "کوکی ها؟"
       general_info: "اطلاعات عمومی"
       help: راهنما
       next: "بعدی »"
-      no_text: هیچ
+      no_text: بدون
       previous: «قبلی
-      read_more: "بیشتر بخوانید"
+      read_more: "ادامه مطلب"
       save: ذخیره
       settings_saved: "تنظیمات را ذخیره شد."
       time_ago: "{{time_in_words}}پیش"