merb_global 0.0.5.1 → 0.0.5.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 
 PLUGIN = "merb_global"
 NAME = "merb_global"
-GEM_VERSION = "0.0.5.1"
+GEM_VERSION = "0.0.5.2"
 AUTHORS = ["Alex Coles", "Maciej Piechotka"]
 EMAIL = "alex@alexcolesportfolio.com"
 HOMEPAGE = "http://trac.ikonoklastik.com/merb_global/"

data/lib/merb_global/message_providers/sequel.rb

@@ -40,7 +40,11 @@ module Merb
         end
 
         def choose(except)
-          Language.filter(~{:name => except}).first[:name]
+          if except.empty?
+            Language.first[:name]
+          else
+            Language.filter(~{:name => except}).first[:name]
+          end
         end
 
         def import
@@ -91,6 +95,7 @@ module Merb
         end
 
         class Language < ::Sequel::Model(:merb_global_languages)
+          set_primary_key :id
           has_many :translations,
                    :class => "Merb::Global::MessageProviders::Sequel::Translation",
                    :key => :language_id

data/sequel_generators/translations_migration/templates/translations_migration.erb

@@ -11,12 +11,12 @@ class AddTranslationsMigration < Sequel::Migration
       varchar	  :plural,       :size => 128
     end
     create_table :merb_global_translations do
-      primary_key [:language_id, :msgid_hash, :msgstr_index]
       foreign_key :language_id,  :null => false
       text   	  :msgid,        :null => false
       text        :msgid_plural
       text	  :msgstr,       :null => false
       integer	  :msgstr_index, :null => true
+      primary_key [:language_id, :msgid, :msgstr_index]
     end
   end
   def down

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.1
+  version: 0.0.5.2
 platform: ruby
 authors: 
 - Alex Coles
@@ -10,7 +10,7 @@ autorequire: merb_global
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 +02:00
+date: 2008-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency