Amend all text strings in en locales to use sentence case

Adapt cukes to work with new capitalisation rules
This commit is contained in:
goobertron 2014-03-11 17:12:23 +00:00
parent 9bfabe677a
commit 42cd2337be
17 changed files with 361 additions and 364 deletions

View file

@ -91,6 +91,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
* Replace a modifier-rescue with a specific rescue [#5491](https://github.com/diaspora/diaspora/pull/5491) * Replace a modifier-rescue with a specific rescue [#5491](https://github.com/diaspora/diaspora/pull/5491)
* Port contacts page to backbone [#5473](https://github.com/diaspora/diaspora/pull/5473) * Port contacts page to backbone [#5473](https://github.com/diaspora/diaspora/pull/5473)
* Replace CSS vendor prefixes automatically [#5532](https://github.com/diaspora/diaspora/pull/5532) * Replace CSS vendor prefixes automatically [#5532](https://github.com/diaspora/diaspora/pull/5532)
* Use sentence case consistently throughout UI [#5588](https://github.com/diaspora/diaspora/pull/5588)
## Bug fixes ## Bug fixes
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158) * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)

File diff suppressed because it is too large Load diff

View file

@ -6,15 +6,15 @@
en: en:
javascripts: javascripts:
confirm_dialog: "Are you sure?" confirm_dialog: "Are you sure?"
confirm_unload: "Please confirm that you want to leave this page - data you have entered won't be saved." confirm_unload: "Please confirm that you want to leave this page. Data you have entered wont be saved."
delete: "Delete" delete: "Delete"
ignore: "Ignore" ignore: "Ignore"
report: report:
prompt: "Please enter a reason:" prompt: "Please enter a reason:"
prompt_default: "offensive content" prompt_default: "e.g. offensive content"
name: "Report" name: "Report"
status: status:
created: "The report was successfully created" created: "The report has successfully been created"
exists: "The report already exists" exists: "The report already exists"
ignore_user: "Ignore this user?" ignore_user: "Ignore this user?"
ignore_failed: "Unable to ignore this user" ignore_failed: "Unable to ignore this user"
@ -25,7 +25,7 @@ en:
and: "and" and: "and"
comma: "," comma: ","
edit: "Edit" edit: "Edit"
no_results: "No Results Found" no_results: "No results found"
timeago: timeago:
prefixAgo: "" prefixAgo: ""
prefixFromNow: "" prefixFromNow: ""
@ -49,13 +49,13 @@ en:
aspect_list_is_visible: "Contacts in this aspect are able to see each other." aspect_list_is_visible: "Contacts in this aspect are able to see each other."
aspect_list_is_not_visible: "Contacts in this aspect are not able to see each other." aspect_list_is_not_visible: "Contacts in this aspect are not able to see each other."
remove_contact: "Remove contact" remove_contact: "Remove contact"
error_add: "Couldn't add <%= name %> to the aspect :(" error_add: "Couldnt add <%= name %> to the aspect :("
error_remove: "Couldn't remove <%= name %> from the aspect :(" error_remove: "Couldnt remove <%= name %> from the aspect :("
search_no_results: "No contacts found" search_no_results: "No contacts found"
my_activity: "My Activity" my_activity: "My activity"
my_stream: "Stream" my_stream: "Stream"
my_aspects: "My Aspects" my_aspects: "My aspects"
videos: videos:
watch: "Watch this video on <%= provider %>" watch: "Watch this video on <%= provider %>"
@ -63,8 +63,8 @@ en:
search_for: "Search for <%= name %>" search_for: "Search for <%= name %>"
publisher: publisher:
at_least_one_aspect: "You must publish to at least one aspect" at_least_one_aspect: "You must publish to at least one aspect"
limited: "Limited - your post will only be seen by people you are sharing with" limited: "Limited: your post will only be seen by people you are sharing with"
public: "Public - your post will be visible to everyone and found by search engines" public: "Public: your post will be visible to everyone and found by search engines"
near_from: "Posted from: <%= location %>" near_from: "Posted from: <%= location %>"
option: "Answer" option: "Answer"
add_option: "Add an answer" add_option: "Add an answer"
@ -82,24 +82,24 @@ en:
all_aspects: "All aspects" all_aspects: "All aspects"
stopped_sharing_with: "You have stopped sharing with <%= name %>." stopped_sharing_with: "You have stopped sharing with <%= name %>."
started_sharing_with: "You have started sharing with <%= name %>!" started_sharing_with: "You have started sharing with <%= name %>!"
error: "Couldn't start sharing with <%= name %>. Are you ignoring them?" error: "Couldnt start sharing with <%= name %>. Are you ignoring them?"
error_remove: "Couldn't remove <%= name %> from the aspect :(" error_remove: "Couldnt remove <%= name %> from the aspect :("
toggle: toggle:
zero: "Select aspects" zero: "Select aspects"
one: "In <%= count %> aspect" one: "In <%= count %> aspect"
other: "In <%= count %> aspects" other: "In <%= count %> aspects"
show_more: "show more" show_more: "Show more"
failed_to_like: "Failed to like!" failed_to_like: "Failed to like!"
failed_to_post_message: "Failed to post message!" failed_to_post_message: "Failed to post message!"
failed_to_remove: "Failed to remove the entry!" failed_to_remove: "Failed to remove the entry!"
comments: comments:
show: "show all comments" show: "Show all comments"
hide: "hide comments" hide: "Hide comments"
no_comments: "There are no comments yet." no_comments: "There are no comments yet."
reshares: reshares:
duplicate: "That good, huh? You've already reshared that post!" duplicate: "That good, eh? Youve already reshared that post!"
successful: "The post was successfully reshared!" successful: "The post was successfully reshared!"
post: "Reshare <%= name %>'s post?" post: "Reshare <%= name %>s post?"
aspect_navigation: aspect_navigation:
select_all: "Select all" select_all: "Select all"
deselect_all: "Deselect all" deselect_all: "Deselect all"
@ -107,8 +107,8 @@ en:
add_an_aspect: "+ Add an aspect" add_an_aspect: "+ Add an aspect"
getting_started: getting_started:
hey: "Hey, <%= name %>!" hey: "Hey, <%= name %>!"
no_tags: "Hey, you haven't followed any tags! Continue anyway?" no_tags: "Hey, you havent followed any tags! Continue anyway?"
alright_ill_wait: "Alright, I'll wait." alright_ill_wait: "All right, Ill wait."
preparing_your_stream: "Preparing your personalized stream..." preparing_your_stream: "Preparing your personalized stream..."
photo_uploader: photo_uploader:
looking_good: "OMG, you look awesome!" looking_good: "OMG, you look awesome!"
@ -118,9 +118,9 @@ en:
size_error: "{file} is too large, maximum file size is {sizeLimit}." size_error: "{file} is too large, maximum file size is {sizeLimit}."
empty: "{file} is empty, please select files again without it." empty: "{file} is empty, please select files again without it."
tags: tags:
wasnt_that_interesting: "OK, I suppose #<%= tagName %> wasn't all that interesting..." wasnt_that_interesting: "OK, I suppose #<%= tagName %> wasnt all that interesting..."
people: people:
not_found: "and no one was found..." not_found: "... and no one was found"
mention: "Mention" mention: "Mention"
message: "Message" message: "Message"
edit_my_profile: "Edit my profile" edit_my_profile: "Edit my profile"
@ -129,9 +129,9 @@ en:
is_sharing: "<%= name %> is sharing with you" is_sharing: "<%= name %> is sharing with you"
is_not_sharing: "<%= name %> is not sharing with you" is_not_sharing: "<%= name %> is not sharing with you"
profile: profile:
edit: "edit" edit: "Edit"
add_some: "add some" add_some: "Add some"
you_have_no_tags: "you have no tags!" you_have_no_tags: "You have no tags!"
ignoring: "You are ignoring all posts from <%= name %>." ignoring: "You are ignoring all posts from <%= name %>."
bio: "Bio" bio: "Bio"
location: "Location" location: "Location"
@ -156,7 +156,7 @@ en:
unlike: "Unlike" unlike: "Unlike"
reshare: "Reshare" reshare: "Reshare"
comment: "Comment" comment: "Comment"
original_post_deleted: "Original post deleted by author." original_post_deleted: "Original post deleted by author"
show_nsfw_post: "Show post" show_nsfw_post: "Show post"
show_nsfw_posts: "Show all" show_nsfw_posts: "Show all"
hide_nsfw_posts: "Hide #nsfw posts" hide_nsfw_posts: "Hide #nsfw posts"
@ -180,7 +180,7 @@ en:
other: "Show <%= count %> more comments" other: "Show <%= count %> more comments"
followed_tag: followed_tag:
title: "#Followed Tags" title: "#Followed tags"
contacts_title: "People who dig these tags" contacts_title: "People who dig these tags"
add_a_tag: "Add a tag" add_a_tag: "Add a tag"
follow: "Follow" follow: "Follow"
@ -188,7 +188,7 @@ en:
tags: tags:
follow: "Follow #<%= tag %>" follow: "Follow #<%= tag %>"
following: "Following #<%= tag %>" following: "Following #<%= tag %>"
stop_following: "Stop Following #<%= tag %>" stop_following: "Stop following #<%= tag %>"
header: header:
home: "Home" home: "Home"
@ -204,10 +204,10 @@ en:
search: "Search" search: "Search"
recent_notifications: "Recent Notifications" recent_notifications: "Recent notifications"
mark_all_as_read: "Mark all as read" mark_all_as_read: "Mark all as read"
view_all: "View all" view_all: "View all"
close: "close" close: "Close"
viewer: viewer:
stop_following_post: "Stop following post" stop_following_post: "Stop following post"
@ -217,7 +217,7 @@ en:
reshare: "Reshare" reshare: "Reshare"
reshared: "Reshared" reshared: "Reshared"
comment: "Comment" comment: "Comment"
home: "HOME" home: "Home"
poll: poll:
vote: "Vote" vote: "Vote"

View file

@ -122,6 +122,6 @@ Feature: following and being followed
And I add the person to my "Unicorns" aspect And I add the person to my "Unicorns" aspect
When I go to "bob@bob.bob"'s page When I go to "bob@bob.bob"'s page
Then I should see "All Aspects" Then I should see "All aspects"
Then I should see a "#mention_button" within "#profile_buttons" Then I should see a "#mention_button" within "#profile_buttons"
Then I should see a "#message_button" within "#profile_buttons" Then I should see a "#message_button" within "#profile_buttons"

View file

@ -35,7 +35,7 @@ Feature: posting
Then I should see "#boss from the #boss tag page" within "body" Then I should see "#boss from the #boss tag page" within "body"
Scenario: can stop following a tag from the tag page Scenario: can stop following a tag from the tag page
When I press "Following #boss" When I press "Stop following #boss"
And I go to the followed tags stream page And I go to the followed tags stream page
Then I should not see "#boss" within "#tags_list" Then I should not see "#boss" within "#tags_list"

View file

@ -59,7 +59,7 @@ Feature: User manages contacts
And I follow "Cat People" And I follow "Cat People"
And I click on selector "#change_aspect_name" And I click on selector "#change_aspect_name"
And I fill in "aspect_name" with "Unicorn People" And I fill in "aspect_name" with "Unicorn People"
And I press "update" And I press "Update"
Then I should see "Unicorn People" within "#aspect_name" Then I should see "Unicorn People" within "#aspect_name"
Scenario: clicking on the contacts link in the header with zero contacts directs a user to the featured users page Scenario: clicking on the contacts link in the header with zero contacts directs a user to the featured users page
@ -69,7 +69,7 @@ Feature: User manages contacts
And I click on my name in the header And I click on my name in the header
When I follow "Contacts" When I follow "Contacts"
Then I should see "Community Spotlight" within ".span9" Then I should see "Community spotlight" within ".span9"
Scenario: clicking on the contacts link in the header with contacts does not send a user to the featured users page Scenario: clicking on the contacts link in the header with contacts does not send a user to the featured users page
Given I am signed in Given I am signed in
@ -78,4 +78,4 @@ Feature: User manages contacts
And I click on my name in the header And I click on my name in the header
When I follow "Contacts" When I follow "Contacts"
Then I should not see "Community Spotlight" within ".span9" Then I should not see "Community spotlight" within ".span9"

View file

@ -20,25 +20,25 @@ Feature: oembed
Scenario: Post an unsecure video link Scenario: Post an unsecure video link
Given I expand the publisher Given I expand the publisher
When I click the publisher and post "http://mytube.com/watch?v=M3r2XDceM6A&format=json" When I click the publisher and post "http://mytube.com/watch?v=M3r2XDceM6A&format=json"
And I follow "My Aspects" And I follow "My aspects"
Then I should not see a video player Then I should not see a video player
And I should see "http://mytube.com/watch?v=M3r2XDceM6A&format=json" within ".stream_element" And I should see "http://mytube.com/watch?v=M3r2XDceM6A&format=json" within ".stream_element"
Scenario: Post an unsecure rich-typed link Scenario: Post an unsecure rich-typed link
Given I expand the publisher Given I expand the publisher
When I click the publisher and post "http://myrichtube.com/watch?v=M3r2XDceM6A&format=json" When I click the publisher and post "http://myrichtube.com/watch?v=M3r2XDceM6A&format=json"
And I follow "My Aspects" And I follow "My aspects"
Then I should not see a video player Then I should not see a video player
And I should see "http://myrichtube.com/watch?v=M3r2XDceM6A&format=json" within ".stream_element" And I should see "http://myrichtube.com/watch?v=M3r2XDceM6A&format=json" within ".stream_element"
Scenario: Post a photo link Scenario: Post a photo link
Given I expand the publisher Given I expand the publisher
When I click the publisher and post "http://farm4.static.flickr.com/3123/2341623661_7c99f48bbf_m.jpg" When I click the publisher and post "http://farm4.static.flickr.com/3123/2341623661_7c99f48bbf_m.jpg"
And I follow "My Aspects" And I follow "My aspects"
Then I should see a "img" within ".stream_element" Then I should see a "img" within ".stream_element"
Scenario: Post an unsupported text link Scenario: Post an unsupported text link
Given I expand the publisher Given I expand the publisher
When I click the publisher and post "http://www.we-do-not-support-oembed.com/index.html" When I click the publisher and post "http://www.we-do-not-support-oembed.com/index.html"
And I follow "My Aspects" And I follow "My aspects"
Then I should see "http://www.we-do-not-support-oembed.com/index.html" within ".stream_element" Then I should see "http://www.we-do-not-support-oembed.com/index.html" within ".stream_element"

View file

@ -23,7 +23,7 @@ Feature: posting from the main page
And ".options_and_submit" is hidden And ".options_and_submit" is hidden
When I expand the publisher When I expand the publisher
Then I should see "You can use Markdown to format your post" within "#publisher-images" Then I should see "You can use Markdown to format your post" within "#publisher-images"
Then I should see "All Aspects" within ".options_and_submit" Then I should see "All aspects" within ".options_and_submit"
Then I should see "Preview" within ".options_and_submit" Then I should see "Preview" within ".options_and_submit"
Scenario: post a text-only message to all aspects Scenario: post a text-only message to all aspects

View file

@ -31,7 +31,7 @@ Feature: new user registration
When I follow "awesome_button" When I follow "awesome_button"
And I reject the alert And I reject the alert
Then I should be on the getting started page Then I should be on the getting started page
And I should see a flash message containing "Alright, I'll wait." And I should see a flash message containing "All right, Ill wait."
Scenario: new user skips the setup wizard Scenario: new user skips the setup wizard
When I follow "awesome_button" When I follow "awesome_button"
@ -44,7 +44,7 @@ Feature: new user registration
And I confirm the alert And I confirm the alert
Then I should be on the stream page Then I should be on the stream page
When I submit the publisher When I submit the publisher
Then "Hey everyone, Im #NewHere." should be post 1 Then "Hey everyone, Im #newhere." should be post 1
Scenario: new user with some tags posts first status message Scenario: new user with some tags posts first status message
When I fill in the following: When I fill in the following:
@ -54,7 +54,7 @@ Feature: new user registration
And I follow "awesome_button" And I follow "awesome_button"
Then I should be on the stream page Then I should be on the stream page
When I submit the publisher When I submit the publisher
Then "Hey everyone, Im #NewHere. Im interested in #rockstar." should be post 1 Then "Hey everyone, Im #newhere. Im interested in #rockstar." should be post 1
Scenario: closing a popover clears getting started Scenario: closing a popover clears getting started
When I follow "awesome_button" When I follow "awesome_button"

View file

@ -50,7 +50,7 @@
And I click to report the post And I click to report the post
And I confirm the alert And I confirm the alert
And I should see a flash message containing "The report was successfully created" And I should see a flash message containing "The report has successfully been created"
Scenario: delete own post Scenario: delete own post
Given I expand the publisher Given I expand the publisher

View file

@ -35,7 +35,7 @@ Feature: Unfollowing
And I remove the first person from the aspect And I remove the first person from the aspect
When I follow "My Contacts" When I follow "My contacts"
Then I should have 0 contacts in "Besties" Then I should have 0 contacts in "Besties"
When I sign out When I sign out

View file

@ -6,19 +6,19 @@ Feature: Viewing my activity on the steam mobile page
Background: Background:
Given a user with username "alice" Given a user with username "alice"
And "alice@alice.alice" has a public post with text "Hello! i am #newhere" And "alice@alice.alice" has a public post with text "Hello! I am #newhere"
When I toggle the mobile view When I toggle the mobile view
And I sign in as "alice@alice.alice" on the mobile website And I sign in as "alice@alice.alice" on the mobile website
Scenario: Show my activity empty Scenario: Show my activity empty
When I open the drawer When I open the drawer
And I follow "My Activity" And I follow "My activity"
Then I should see "My Activity" Then I should see "My activity"
And I should not see "Hello! i am #newhere" And I should not see "Hello! I am #newhere"
Scenario: Show post on my activity Scenario: Show post on my activity
When I click on selector "a.image_link.like_action.inactive" When I click on selector "a.image_link.like_action.inactive"
And I open the drawer And I open the drawer
And I follow "My Activity" And I follow "My activity"
Then I should see "My Activity" Then I should see "My activity"
And I should see "Hello! i am #newhere" within ".ltr" And I should see "Hello! I am #newhere" within ".ltr"

View file

@ -17,7 +17,7 @@ Feature: Naviguate between pages using the header menu and the drawer
Scenario: naviguate to the stream page Scenario: naviguate to the stream page
When I open the drawer When I open the drawer
And I follow "My Activity" And I follow "My activity"
And I click on selector "#header_title" And I click on selector "#header_title"
Then I should see "There are no posts yet." within "#main_stream" Then I should see "There are no posts yet." within "#main_stream"
@ -31,7 +31,7 @@ Feature: Naviguate between pages using the header menu and the drawer
Scenario: naviguate to the publisher page Scenario: naviguate to the publisher page
When I click on selector "#compose_badge" When I click on selector "#compose_badge"
Then I should see "All Aspects" within "#new_status_message" Then I should see "All aspects" within "#new_status_message"
Scenario: search a user Scenario: search a user
When I open the drawer When I open the drawer
@ -45,8 +45,8 @@ Feature: Naviguate between pages using the header menu and the drawer
Scenario: naviguate to my activity page Scenario: naviguate to my activity page
When I open the drawer When I open the drawer
And I follow "My Activity" And I follow "My activity"
Then I should see "My Activity" within "#main" Then I should see "My activity" within "#main"
Scenario: naviguate to my mentions page Scenario: naviguate to my mentions page
Given Alice has a post mentioning Bob Given Alice has a post mentioning Bob
@ -58,7 +58,7 @@ Feature: Naviguate between pages using the header menu and the drawer
Scenario: naviguate to my aspects page Scenario: naviguate to my aspects page
Given "bob@bob.bob" has a public post with text "bob's text" Given "bob@bob.bob" has a public post with text "bob's text"
When I open the drawer When I open the drawer
And I follow "My Aspects" And I follow "My aspects"
Then I should see "Besties" within "#all_aspects + li > ul" Then I should see "Besties" within "#all_aspects + li > ul"
And I follow "Besties" And I follow "Besties"
Then I should see "bob's text" within "#main_stream" Then I should see "bob's text" within "#main_stream"
@ -66,7 +66,7 @@ Feature: Naviguate between pages using the header menu and the drawer
Scenario: naviguate to the followed tags page Scenario: naviguate to the followed tags page
Given "bob@bob.bob" has a public post with text "bob is da #boss" Given "bob@bob.bob" has a public post with text "bob is da #boss"
When I open the drawer When I open the drawer
And I follow "#Followed Tags" And I follow "#Followed tags"
Then I should see "#boss" within "#followed_tags + li > ul" Then I should see "#boss" within "#followed_tags + li > ul"
And I follow "#boss" And I follow "#boss"
Then I should see "bob is da #boss" within "#main_stream" Then I should see "bob is da #boss" within "#main_stream"

View file

@ -15,7 +15,7 @@ Feature: reactions mobile post
And I sign in as "bob@bob.bob" on the mobile website And I sign in as "bob@bob.bob" on the mobile website
Scenario: like on a mobile post Scenario: like on a mobile post
When I should see "0 reactions" within ".show_comments" When I should see "No reactions" within ".show_comments"
And I click on selector "span.show_comments" And I click on selector "span.show_comments"
And I click on selector "a.image_link.like_action.inactive" And I click on selector "a.image_link.like_action.inactive"
Then I should see a "a.image_link.like_action.active" Then I should see a "a.image_link.like_action.active"

View file

@ -21,7 +21,7 @@ Feature: resharing from the mobile
And I confirm the alert And I confirm the alert
Then I should see a "a.image_link.reshare_action.active" Then I should see a "a.image_link.reshare_action.active"
When I go to the stream page When I go to the stream page
Then I should see "reshared via" within ".reshare_via" Then I should see "Reshared via" within ".reshare_via"
Scenario: Resharing a post from a single post page that is reshared Scenario: Resharing a post from a single post page that is reshared
Given the post with text "reshare this!" is reshared by "eve@eve.eve" Given the post with text "reshare this!" is reshared by "eve@eve.eve"
@ -31,7 +31,7 @@ Feature: resharing from the mobile
And I confirm the alert And I confirm the alert
Then I should see a "a.image_link.reshare_action.active" Then I should see a "a.image_link.reshare_action.active"
When I go to the stream page When I go to the stream page
Then I should see "reshared via" within ".reshare_via" Then I should see "Reshared via" within ".reshare_via"
Scenario: Delete original reshared post Scenario: Delete original reshared post
Given "alice@alice.alice" has a public post with text "Don't reshare this!" Given "alice@alice.alice" has a public post with text "Don't reshare this!"
@ -41,8 +41,8 @@ Feature: resharing from the mobile
And I log out And I log out
And I sign in as "bob@bob.bob" And I sign in as "bob@bob.bob"
And I toggle the mobile view And I toggle the mobile view
Then I should see "Original post deleted by author." within ".reshare" Then I should see "Original post deleted by author" within ".reshare"
And I log out And I log out
And I sign in as "eve@eve.eve" on the mobile website And I sign in as "eve@eve.eve" on the mobile website
And I toggle the mobile view And I toggle the mobile view
Then I should see "Original post deleted by author." within ".reshare" Then I should see "Original post deleted by author" within ".reshare"

View file

@ -44,7 +44,7 @@ When /^I click on "([^"]*)" aspect edit icon$/ do |aspect_name|
end end
When /^I select only "([^"]*)" aspect$/ do |aspect_name| When /^I select only "([^"]*)" aspect$/ do |aspect_name|
click_link 'My Aspects' click_link 'My aspects'
within('#aspects_list') do within('#aspects_list') do
click_link 'Deselect all' click_link 'Deselect all'
current_scope.should have_no_css '.selected' current_scope.should have_no_css '.selected'

View file

@ -4,7 +4,7 @@ describe("app.views.AspectsDropdown", function(){
Diaspora.I18n.reset({ Diaspora.I18n.reset({
'aspect_dropdown': { 'aspect_dropdown': {
'select_aspects': "Select aspects", 'select_aspects': "Select aspects",
'all_aspects': "All Aspects", 'all_aspects': "All aspects",
'toggle': { 'toggle': {
'zero': "Select aspects", 'zero': "Select aspects",
'one': "In <%= count %> aspect", 'one': "In <%= count %> aspect",