Merge pull request #164 from Muskworker/master

tweaks for broken things in rc2

Author: Muskworker

app/assets/javascripts/application.js.erb

@@ -221,7 +221,7 @@ fetch_languages = function() {
         content.down('.language-content').childElements().invoke('disable');
 
         langtabs = content.down('.language-list ul');
-        langtabs.childElements().each(function(tab){ Effect.Fade(tab, {duration: 0.25})});
+//        langtabs.childElements().each(function(tab){ Effect.Fade(tab, {duration: 0.25})});
         langtabs.insert({top: "<li class=\"throb\"><img class=\"throb\" src=\"<%= asset_path('icons/throbber.gif') %>\" style=\"vertical-align:middle\" width=\"12\" height=\"12\"></li>"});
     });
 
@@ -270,10 +270,10 @@ function update_languages(languages) {
 
                 newfield = oldfield.up().appendChild(oldfield.clone(true));
                     posindex = oldfield.identify().lastIndexOf(oldlang);
-                newfield.id = oldfield.identify().substring(0, posindex) + language.underscore_code + oldfield.identify().substring(0, posindex + oldlang.length)
+                newfield.id = oldfield.identify().substring(0, posindex) + language.underscore_code + oldfield.identify().substring(posindex + oldlang.length)
 //                newfield.id = oldfield.identify().replace(/(.+_).+$/, "$1"+language.underscore_code);
                     posindex = oldfield.name.lastIndexOf(oldlang);
-                newfield.name = oldfield.name.substring(0, posindex) + language.underscore_code + oldfield.name.substring(0, posindex + oldlang.length)
+                newfield.name = oldfield.name.substring(0, posindex) + language.underscore_code + oldfield.name.substring(posindex + oldlang.length)
 //                newfield.name = oldfield.name.replace(/(.+_).*?\]$/, "$1"+language.underscore_code+"]");
                 newfield.clear();
                 newtab = oldtab.up().appendChild(oldtab.clone(true));

app/controllers/dictionaries_controller.rb

@@ -33,6 +33,7 @@ def show
     unsorted_lexemes = @dictionary.lexemes.includes([{:dictionaries => [:source_language]}, {:headwords => [:phonetic_forms, :language]}, {:subentries => [{:senses => [{:glosses => :language}, :notes, :language]}, {:etymologies => [:notes, :original_language, {:next_etymon => [:notes, :original_language, :next_etymon] }]}, {:notes => :language}, :language]}])
     @lexemes = @source_language.sort(unsorted_lexemes, by: :primary_headword)
     @page_title = @dictionary.title
+    @langs = Dictionary.langs_hash_for(@dictionary)
 
     respond_to do |format|
       format.html # show.html.erb

app/controllers/lexemes_controller.rb

@@ -36,6 +36,7 @@ def show
     @authors_of = Hash[@constructions.collect {|construction| [construction, construction.loci.collect(&:source).collect(&:author).uniq] }]
     @loci_by = Hash[@authors_of.collect { |construction, authors| [construction, Hash[authors.collect {|author| [author, Locus.attesting([construction, @lexeme]).find(:all, :joins => { :source => :authorship }, :conditions => { :id => construction.loci, :authorships => {:author_id => author}}, :group => "loci.id")] }]]}]
     @page_title = view_context.titleize_headwords_for @lexeme
+    @langs = Dictionary.langs_hash_for(@lexeme.dictionaries)
 
     respond_to do |format|
       format.html # show.html.erb
@@ -86,7 +87,7 @@ def new
     @lexeme.headwords.build
     @lexeme.subentries.build
     @page_title = flash[:headword].present? ? 
-      t('lexemes.new.page_title_with_headwords', headwords: view_context.titleize_headwords_for(@lexeme)) : 
+      t('lexemes.new.page_title_with_headwords', headwords: flash[:headword]) :
       t('lexemes.new.page_title')
 
    @langs = Dictionary.langs_hash_for(@lexeme.dictionaries)
@@ -134,6 +135,9 @@ def create
         end
         format.xml { render :xml => @lexeme, :status => :created, :location => @lexeme }
       else
+        @dictionaries = @lexeme.dictionaries
+        @langs = Dictionary.langs_hash_for(@dictionaries)
+        
         format.html { render :action => "new" }
         format.xml { render :xml => @lexeme.errors, :status => :unprocessable_entity }
       end
@@ -170,6 +174,8 @@ def update
         end
         format.xml { head :ok }
       else
+        @dictionaries = @lexeme.dictionaries
+        @langs = Dictionary.langs_hash_for(@dictionaries)
         format.html { render :action => "edit" }
         format.xml { render :xml => @lexeme.errors, :status => :unprocessable_entity }
       end

app/helpers/application_helper.rb

@@ -278,4 +278,10 @@ def translatable_tag form, field, attribute, languages = [], html_options = {}
       output << language_tabs(languages)
     end
   end 
+  
+  def source lang = (@langs[:source].first if @langs), &block
+    Globalize.with_locale(lang.iso_639_code) do
+      yield
+    end
+  end
 end

app/models/headword.rb

@@ -13,7 +13,7 @@ class Headword < ActiveRecord::Base
   belongs_to :lexeme
   delegate :senses, :to => '(lexeme or return nil)'
   belongs_to :language
-  validates_presence_of :form
+  validate :any_form_present?
 
   before_save :set_defaults
 
@@ -58,4 +58,11 @@ def prescriptively_ok?
   def prescriptively_ok=(status)
     self.acceptance = (acceptance & DESCRIPTIVE) | (status.to_i * PRESCRIPTIVE) 
   end
+  
+  protected
+  def any_form_present?
+    if globalize_attribute_names.select {|k,v| k.to_s.start_with?("form")}.all? {|v| v.blank? }
+      errors.add(:form, I18n.t('errors.messages.blank'))
+    end
+  end
 end

app/models/lexeme.rb

@@ -26,7 +26,7 @@ def headword_forms
   end
 
   def primary_headword
-    headwords.order('acceptance DESC').first.try(:form)
+    Globalize.with_locale(language.iso_639_code) { headwords.order('acceptance DESC').first.try(:form) }
   end
 
   def loci(options = {})
@@ -39,7 +39,7 @@ def loci(options = {})
   # dictionary.  Otherwise, fetch all results with any of the lexeme's headwords in its paradigm
   # that are linked wiki-style (e.g. [[foo]] or [[foo|bar]]).
   def constructions (from_dictionary = nil)
-    heads = headword_forms.collect{|form| ["%[[" + form + "|%", "%[[" + form + "]]%"]}.flatten
+    heads = headword_forms.compact.collect{|form| ["%[[" + form + "|%", "%[[" + form + "]]%"]}.flatten
     return {} if heads.empty?
     headlike = "(subentries.paradigm LIKE ?" + " OR subentries.paradigm LIKE ?" * (heads.length - 1) + ")"
 
@@ -67,11 +67,11 @@ def self.lookup_all_by_headwords(forms, options ={})
 
     case options[:matchtype] ||= EXACT
     when SUBSTRING
-      headwords_like = "(headwords.form LIKE ?" + " OR headwords.form LIKE ?" * (forms.length - 1) + ")"
+      headwords_like = "(headword_translations.form LIKE ?" + " OR headword_translations.form LIKE ?" * (forms.length - 1) + ")"
       wildcarded_forms = forms.collect {|form| "%#{form}%"}
-      Lexeme.joins(:headwords).where([headwords_like, *wildcarded_forms]).includes(options[:include]).group(:lexeme_id)
+      Lexeme.joins(:headwords => [:translations]).where([headwords_like, *wildcarded_forms]).includes(options[:include]).group(:lexeme_id)
     when EXACT
-      Lexeme.joins(:headwords).where(["headwords.form IN (?)", forms]).includes(options[:include])
+      Lexeme.joins(:headwords => [:translations]).where(["headword_translations.form IN (?)", forms]).includes(options[:include])
     end
   end
 

app/models/phonetic_form.rb

@@ -5,5 +5,12 @@ class PhoneticForm < ActiveRecord::Base
   translates :form, :fallbacks_for_empty_translations => true
   globalize_accessors :locales => (Language.all.collect(&:iso_639_code) | [I18n.default_locale])
 
-  validates_presence_of :form
+  validate :any_form_present?
+  
+  protected
+  def any_form_present?
+    if globalize_attribute_names.select {|k,v| k.to_s.start_with?("form")}.all? {|v| v.blank? }
+      errors.add(:form, I18n.t('errors.messages.blank'))
+    end
+  end
 end

app/models/subentry.rb

@@ -5,7 +5,7 @@ class Subentry < ActiveRecord::Base
   belongs_to :language
   has_many :senses
   has_many :notes, :as => :annotatable
-  validates_presence_of :paradigm
+  validate :any_paradigm_present?
   translates :paradigm, :part_of_speech, :fallbacks_for_empty_translations => true
   globalize_accessors :locales => (Language.all.collect(&:iso_639_code) | [I18n.default_locale])
 
@@ -28,4 +28,11 @@ def set_defaults
 
   	self.language ||= default_language
 	end
+  
+  protected
+  def any_paradigm_present?
+    if globalize_attribute_names.select {|k,v| k.to_s.start_with?("paradigm")}.all? {|v| v.blank? }
+      errors.add(:paradigm, I18n.t('errors.messages.blank'))
+    end
+  end
 end

app/views/dictionaries/show.html.erb

@@ -1,17 +1,17 @@
 <%  I18n.locale = @dictionary.definition_language
     for lexeme in @lexemes %>
 	<dl class="dictform-entry">
-		<dt class="dictform-headword" <%= lang_for(lexeme.headwords) %>><%= t('.headwords', headwords: titleize_headwords_for(lexeme), default: "%{headwords}.") %></dt>
+		<dt class="dictform-headword" <%= lang_for(lexeme.headwords) %>><%= link_to source{t('.headwords', headwords: titleize_headwords_for(lexeme), default: "%{headwords}.")}, lexeme %></dt>
 		<% for headword in lexeme.headwords %>
-			<dd class="dictform-phonetic-form" <%= lang_for(headword, :variant => 'fonipa') %>><%= h headword.phonetic_forms.compact.collect{|x| t('.phonetic_form', form: x.form, default: "/%{form}/")}.to_options_sentence(@dictionary.definition_language) %></dd>
+			<dd class="dictform-phonetic-form" <%= lang_for(headword, :variant => 'fonipa') %>><%= source{h headword.phonetic_forms.compact.collect{|x| t('.phonetic_form', form: x.form, default: "/%{form}/")}.to_options_sentence(@dictionary.definition_language)} %></dd>
 		<% end %>
 		<% for subentry in lexeme.subentries %>
 			<dd class="dictform-subentry"  <%= lang_for(subentry) %>>
 				<dl class="dictform-subentry-senses">
 					<dt class="dictform-paradigm">
-						<%=wh subentry.paradigm ? 
+						<%=source{wh subentry.paradigm ? 
                                 t('.principal_parts', paradigm: subentry.paradigm, default: "%{paradigm}.") : 
-                                t('.no_principal_parts') %>
+                                t('.no_principal_parts')} %>
 					</dt>
 					<dd class="dictform-part-of-speech">
 						<%=h subentry.part_of_speech || t('.no_part_of_speech') %>

app/views/shared/_headword.html.erb

@@ -1 +1 @@
-<span class="lexform-phonetic-form" <%= lang_for(headword, :variant => 'fonipa') %>><%= h sentence_case(headword.phonetic_forms.compact.collect{|x| t('.phonetic_form', form: x.form, default: "/%{form}/")}.to_options_sentence) %></span>
+<span class="lexform-phonetic-form" <%= lang_for(headword, :variant => 'fonipa') %>><%= source(lexeme.language){ h sentence_case(headword.phonetic_forms.compact.collect{|x| t('.phonetic_form', form: x.form, default: "/%{form}/")}.to_options_sentence) } %></span>