Merge pull request #823 from jestallin/658_pages_and_links

GS-658 - internationalize header links and some page titles
This commit is contained in:
Cesy
2015-09-03 10:16:07 +01:00
11 changed files with 96 additions and 31 deletions

View File

@@ -1,5 +1,5 @@
- content_for :title, "Browse crops"
- content_for :subtitle, "#{@crops.size} total"
- content_for :title, t('.title')
- content_for :subtitle, t('.subtitle', crops_size: @crops.size)
- if can? :wrangle, Crop
= link_to 'Wrangle Crops', wrangle_crops_path, :class => 'btn btn-primary'

View File

@@ -1,4 +1,4 @@
- content_for :title, "Forums"
- content_for :title, t('.title')
- if can? :create, Forum
%p

View File

@@ -1,4 +1,4 @@
- content_for :title, @owner ? "#{@owner}'s harvests" : @crop ? "Everyone's #{@crop.name} harvests" : "Everyone's harvests"
- content_for :title, @owner ? t('.title.owner_harvests', owner: @owner) : @crop ? t('.title.crop_harvests', crop: @crop.name) : t('.title.default')
- if @owner
= link_to "View #{@owner}'s profile >>", member_path(@owner)

View File

@@ -23,48 +23,48 @@
Crops
%b.caret
%ul.dropdown-menu
%li= link_to "Browse Crops", crops_path
%li= link_to "Seeds", seeds_path
%li= link_to "Plantings", plantings_path
%li= link_to "Harvests", harvests_path
%li= link_to t('.browse_crops'), crops_path
%li= link_to t('.seeds'), seeds_path
%li= link_to t('.plantings'), plantings_path
%li= link_to t('.harvests'), harvests_path
%li.dropdown<
%a.dropdown-toggle{'data-toggle' => 'dropdown', :href => members_path}
Community
%b.caret
%ul.dropdown-menu
%li= link_to "Community Map", places_path
%li= link_to "Browse Members", members_path
%li= link_to "Posts", posts_path
%li= link_to "Forums", forums_path
%li= link_to "Support Growstuff", shop_path
%li= link_to t('.community_map'), places_path
%li= link_to t('.browse_members'), members_path
%li= link_to t('.posts'), posts_path
%li= link_to t('.forums'), forums_path
%li= link_to t('.support_growstuff'), shop_path
- if member_signed_in?
%li.dropdown<
%a.dropdown-toggle{'data-toggle' => 'dropdown', :href => root_path}
- if current_member.notifications.unread_count > 0
Your Stuff (#{current_member.notifications.unread_count})
= t('.your_stuff', unread_count: current_member.notifications.unread_count)
- else
#{current_member.login_name}
%b.caret
%ul.dropdown-menu
%li= link_to "Profile", member_path(current_member)
%li= link_to "Gardens", gardens_by_owner_path(:owner => current_member.slug)
%li= link_to "Plantings", plantings_by_owner_path(:owner => current_member.slug)
%li= link_to "Harvests", harvests_by_owner_path(:owner => current_member.slug)
%li= link_to "Seeds", seeds_by_owner_path(:owner => current_member.slug)
%li= link_to "Posts", posts_by_author_path(:author => current_member.slug)
%li= link_to "Account", orders_path
%li= link_to t('.profile'), member_path(current_member)
%li= link_to t('.gardens'), gardens_by_owner_path(:owner => current_member.slug)
%li= link_to t('.plantings'), plantings_by_owner_path(:owner => current_member.slug)
%li= link_to t('.harvest'), harvests_by_owner_path(:owner => current_member.slug)
%li= link_to t('.seeds'), seeds_by_owner_path(:owner => current_member.slug)
%li= link_to t('.posts'), posts_by_author_path(:author => current_member.slug)
%li= link_to t('.account'), orders_path
%li
- if current_member.notifications.unread_count > 0
= link_to("Inbox (#{current_member.notifications.unread_count})", notifications_path)
= link_to(t('.inbox_unread', unread_count: current_member.notifications.unread_count), notifications_path)
- else
= link_to("Inbox", notifications_path)
= link_to(t('.inbox'), notifications_path)
- if current_member.has_role?(:crop_wrangler) || current_member.has_role?(:admin)
%li{:class => 'divider', :role => 'presentation'}
- if current_member.has_role?(:crop_wrangler)
%li= link_to "Crop Wrangling", wrangle_crops_path
%li= link_to t('.crop_wrangling'), wrangle_crops_path
- if current_member.has_role?(:admin)
%li= link_to "Admin", admin_path
%li= link_to t('.admin'), admin_path
%li= link_to "Sign out", destroy_member_session_path, :method => :delete

View File

@@ -1,4 +1,4 @@
= content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} members"
= content_for :title, t(".title", site_name: "#{ENV['GROWSTUFF_SITE_NAME']}")
= form_tag(members_path, :method => :get, :class => 'form-inline', :role => 'form') do
.form-group

View File

@@ -1,4 +1,4 @@
-content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} Community Map"
-content_for :title, t(".title", site_name: "#{ENV['GROWSTUFF_SITE_NAME']}")
= render partial: 'search_form'
%div#placesmap

View File

@@ -1,4 +1,4 @@
- content_for :title, @owner ? "#{@owner}'s plantings" : @crop ? "Everyone's #{@crop.name} plantings" : "Everyone's plantings"
- content_for :title, @owner ? t('.title.owner_plantings', owner: @owner) : @crop ? t('.title.crop_plantings', crop: @crop.name) : t('.title.default')
- if @owner
= link_to "View #{@owner}'s profile >>", member_path(@owner)

View File

@@ -1,4 +1,4 @@
- content_for :title, @author ? "#{@author}'s posts" : "Everyone's posts"
- content_for :title, @author ? t('.title.author_posts', author: @author) : t('.title.default')
%p
- if can? :create, Post

View File

@@ -1,4 +1,4 @@
- content_for :title, @owner ? "#{@owner}'s seeds" : @crop ? "Everyone's #{@crop.name} seeds" : "Everyone's seeds"
- content_for :title, @owner ? t('.title.owner_seeds', owner: @owner) : @crop ? t('.title.crop_seeds', crop: @crop.name) : t('.title.default')
- if @owner
= link_to "View #{@owner}'s profile >>", member_path(@owner)

View File

@@ -1,4 +1,4 @@
-content_for :title, 'Shop'
-content_for :title, t('.title')
%p
Growstuff relies on your support to build and run this open source

View File

@@ -17,6 +17,71 @@ en:
layouts:
header:
skip: "Skip navigation menu"
browse_crops: &browse_crops "Browse Crops"
seeds: "Seeds"
plantings: "Plantings"
harvests: "Harvests"
community_map: "Community Map"
browse_members: "Browse Members"
posts: "Posts"
forums: &forums "Forums"
support_growstuff: "Support Growstuff"
profile: "Profile"
gardens: "Gardens"
account: "Account"
inbox_unread: "Inbox (%{unread_count})"
inbox: "Inbox"
crop_wrangling: "Crop Wrangling"
admin: "Admin"
your_stuff: "Your Stuff (%{unread_count})"
crops:
index:
title: *browse_crops
subtitle: "%{crops_size} total"
seeds:
index:
title:
default: "Everyone's seeds"
crop_seeds: "Everyone's %{crop} seeds"
owner_seeds: "%{owner} seeds"
plantings:
index:
title:
default: "Everyone's plantings"
crop_plantings: "Everyone's %{crop} plantings"
owner_plantings: "%{owner} plantings"
harvests:
index:
title:
default: "Everyone's harvests"
crop_harvests: "Everyone's %{crop} harvests"
owner_harvests: "%{owner} harvests"
places:
index:
title: "%{site_name} Community Map"
members:
index:
title: "%{site_name} members"
posts:
index:
title:
default: "Everyone's posts"
author_posts: "%{author} posts"
shop:
index:
title: "Shop"
forums:
index:
title: *forums
home:
blurb: