Updated zh_tw translation for sidebar labels

Conflicts:
	vendor/built_in_modules/location/config/locales/zh_tw.yml
This commit is contained in:
saurabhbhatia 2013-07-05 11:33:46 +08:00
parent 7ea9945af0
commit c8292a7619
6 changed files with 15 additions and 6 deletions

View File

@ -35,5 +35,4 @@ end
# base.define_singleton_method :last do |*args|
# all.last
# end
>>>>>>> 87741bf... Location - category fixes
# end

View File

@ -8,7 +8,7 @@ defaults: &defaults
development:
<<: *defaults
database: demo_site_development
database: test_site
test:
<<: *defaults
database: test_site

View File

@ -1,6 +1,8 @@
class LocationInfo
include Mongoid::Document
include Mongoid::Timestamps
include OrbitCategory::Categorizable
mount_uploader :file, LocationsUploader

View File

@ -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 %>

View File

@ -1,3 +1,7 @@
en:
location:
location: Location
location: Location
categories: Categories
all_locations: All Locations
add_location: Add Location
add_category: Add Category

View File

@ -1,3 +1,7 @@
zh_tw:
location:
location: 地標
location: 地標
categories: 類別
all_locations: 全部地點
add_location: 新增地點
add_category: 新增類別