resolve merge conflicts

2 files changed, 37 insertions, 0 deletions

diff --git a/db/migrate/096_create_translation_tables.rb b/db/migrate/096_create_translation_tables.rb
new file mode 100644
index 000000000..9d7cc65ad
--- /dev/null
+++ b/db/migrate/096_create_translation_tables.rb
@@ -0,0 +1,27 @@
+class CreateTranslationTables < ActiveRecord::Migration
+  def self.up
+    fields = {:name => :text, 
+      :short_name => :text,
+      :request_email => :text,
+      :url_name => :text,
+      :notes => :text,
+      :first_letter => :string, 
+      :publication_scheme => :text}
+    PublicBody.create_translation_table!(fields)
+
+    # copy current values across to default locale
+    PublicBody.all.each do |publicbody|
+      publicbody.translated_attributes.each do |a, default|
+        value = publicbody.read_attribute(a)
+        unless value.nil?
+          publicbody.send(:"#{a}=", publicbody.read_attribute(a))
+        end
+      end
+    end    
+  end
+
+
+  def self.down
+    PublicBody.drop_translation_table!
+  end
+end
diff --git a/db/migrate/097_add_comment_locale.rb b/db/migrate/097_add_comment_locale.rb
new file mode 100644
index 000000000..92ac7c4a5
--- /dev/null
+++ b/db/migrate/097_add_comment_locale.rb
@@ -0,0 +1,10 @@
+class AddCommentLocale < ActiveRecord::Migration
+    def self.up
+        add_column :comments, :locale, :text, :null => false, :default => ""
+    end
+
+    def self.down
+        remove_column :comments, :locale
+    end
+end
+