From c8292a7619a2e9894d323c09861500b2bb71419e Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Fri, 5 Jul 2013 11:33:46 +0800
Subject: [PATCH] Updated zh_tw translation for sidebar labels

Conflicts:
	vendor/built_in_modules/location/config/locales/zh_tw.yml
---
 app/models/category.rb                                      | 3 +--
 config/mongoid.yml                                          | 2 +-
 .../built_in_modules/location/app/models/location_info.rb   | 2 ++
 .../views/panel/location/back_end/locations/index.html.erb  | 2 +-
 vendor/built_in_modules/location/config/locales/en.yml      | 6 +++++-
 vendor/built_in_modules/location/config/locales/zh_tw.yml   | 6 +++++-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 02dca2ac..42d51bc3 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -35,5 +35,4 @@ end
 
       # base.define_singleton_method :last do |*args|
       #   all.last
-      # end
->>>>>>> 87741bf... Location - category fixes
+      # end
\ No newline at end of file
diff --git a/config/mongoid.yml b/config/mongoid.yml
index bc925ba3..2fa55a36 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: demo_site_development
+  database: test_site
 test:
   <<: *defaults
   database: test_site
diff --git a/vendor/built_in_modules/location/app/models/location_info.rb b/vendor/built_in_modules/location/app/models/location_info.rb
index 23e87841..df6d80eb 100644
--- a/vendor/built_in_modules/location/app/models/location_info.rb
+++ b/vendor/built_in_modules/location/app/models/location_info.rb
@@ -1,6 +1,8 @@
 class LocationInfo
   include Mongoid::Document
   include Mongoid::Timestamps
+  include OrbitCategory::Categorizable
+
 
   mount_uploader :file, LocationsUploader
 
diff --git a/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb b/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
index 12d23773..3190012b 100644
--- a/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
+++ b/vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
@@ -29,5 +29,5 @@
   </tbody>
 </table>
 <%if is_manager? %>
-<td><%= link_to 'New', new_panel_location_back_end_location_path %></td>
+<td><%= link_to 'Add', new_panel_location_back_end_location_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn"%></td>
 <% end %>
diff --git a/vendor/built_in_modules/location/config/locales/en.yml b/vendor/built_in_modules/location/config/locales/en.yml
index 5f7ec8ea..95fffb61 100644
--- a/vendor/built_in_modules/location/config/locales/en.yml
+++ b/vendor/built_in_modules/location/config/locales/en.yml
@@ -1,3 +1,7 @@
 en:
   location:
-    location: Location
\ No newline at end of file
+    location: Location
+    categories: Categories
+    all_locations: All Locations
+    add_location: Add Location
+    add_category: Add Category
diff --git a/vendor/built_in_modules/location/config/locales/zh_tw.yml b/vendor/built_in_modules/location/config/locales/zh_tw.yml
index ce53ff5b..8c6b4ea7 100644
--- a/vendor/built_in_modules/location/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/location/config/locales/zh_tw.yml
@@ -1,3 +1,7 @@
 zh_tw:
   location:
-    location: 地標
\ No newline at end of file
+    location: 地標
+    categories: 類別
+    all_locations: 全部地點
+    add_location: 新增地點
+    add_category: 新增類別
\ No newline at end of file