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
parent
9bfabe677a
commit
42cd2337be
17 changed files with 361 additions and 364 deletions
|
|
@ -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)
|
||||
* 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)
|
||||
* Use sentence case consistently throughout UI [#5588](https://github.com/diaspora/diaspora/pull/5588)
|
||||
|
||||
## Bug fixes
|
||||
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -6,15 +6,15 @@
|
|||
en:
|
||||
javascripts:
|
||||
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 won’t be saved."
|
||||
delete: "Delete"
|
||||
ignore: "Ignore"
|
||||
report:
|
||||
prompt: "Please enter a reason:"
|
||||
prompt_default: "offensive content"
|
||||
prompt_default: "e.g. offensive content"
|
||||
name: "Report"
|
||||
status:
|
||||
created: "The report was successfully created"
|
||||
created: "The report has successfully been created"
|
||||
exists: "The report already exists"
|
||||
ignore_user: "Ignore this user?"
|
||||
ignore_failed: "Unable to ignore this user"
|
||||
|
|
@ -25,7 +25,7 @@ en:
|
|||
and: "and"
|
||||
comma: ","
|
||||
edit: "Edit"
|
||||
no_results: "No Results Found"
|
||||
no_results: "No results found"
|
||||
timeago:
|
||||
prefixAgo: ""
|
||||
prefixFromNow: ""
|
||||
|
|
@ -49,13 +49,13 @@ en:
|
|||
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."
|
||||
remove_contact: "Remove contact"
|
||||
error_add: "Couldn't add <%= name %> to the aspect :("
|
||||
error_remove: "Couldn't remove <%= name %> from the aspect :("
|
||||
error_add: "Couldn’t add <%= name %> to the aspect :("
|
||||
error_remove: "Couldn’t remove <%= name %> from the aspect :("
|
||||
search_no_results: "No contacts found"
|
||||
|
||||
my_activity: "My Activity"
|
||||
my_activity: "My activity"
|
||||
my_stream: "Stream"
|
||||
my_aspects: "My Aspects"
|
||||
my_aspects: "My aspects"
|
||||
|
||||
videos:
|
||||
watch: "Watch this video on <%= provider %>"
|
||||
|
|
@ -63,8 +63,8 @@ en:
|
|||
search_for: "Search for <%= name %>"
|
||||
publisher:
|
||||
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"
|
||||
public: "Public - your post will be visible to everyone and found by search engines"
|
||||
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"
|
||||
near_from: "Posted from: <%= location %>"
|
||||
option: "Answer"
|
||||
add_option: "Add an answer"
|
||||
|
|
@ -82,24 +82,24 @@ en:
|
|||
all_aspects: "All aspects"
|
||||
stopped_sharing_with: "You have stopped sharing with <%= name %>."
|
||||
started_sharing_with: "You have started sharing with <%= name %>!"
|
||||
error: "Couldn't start sharing with <%= name %>. Are you ignoring them?"
|
||||
error_remove: "Couldn't remove <%= name %> from the aspect :("
|
||||
error: "Couldn’t start sharing with <%= name %>. Are you ignoring them?"
|
||||
error_remove: "Couldn’t remove <%= name %> from the aspect :("
|
||||
toggle:
|
||||
zero: "Select aspects"
|
||||
one: "In <%= count %> aspect"
|
||||
other: "In <%= count %> aspects"
|
||||
show_more: "show more"
|
||||
show_more: "Show more"
|
||||
failed_to_like: "Failed to like!"
|
||||
failed_to_post_message: "Failed to post message!"
|
||||
failed_to_remove: "Failed to remove the entry!"
|
||||
comments:
|
||||
show: "show all comments"
|
||||
hide: "hide comments"
|
||||
show: "Show all comments"
|
||||
hide: "Hide comments"
|
||||
no_comments: "There are no comments yet."
|
||||
reshares:
|
||||
duplicate: "That good, huh? You've already reshared that post!"
|
||||
duplicate: "That good, eh? You’ve already reshared that post!"
|
||||
successful: "The post was successfully reshared!"
|
||||
post: "Reshare <%= name %>'s post?"
|
||||
post: "Reshare <%= name %>’s post?"
|
||||
aspect_navigation:
|
||||
select_all: "Select all"
|
||||
deselect_all: "Deselect all"
|
||||
|
|
@ -107,8 +107,8 @@ en:
|
|||
add_an_aspect: "+ Add an aspect"
|
||||
getting_started:
|
||||
hey: "Hey, <%= name %>!"
|
||||
no_tags: "Hey, you haven't followed any tags! Continue anyway?"
|
||||
alright_ill_wait: "Alright, I'll wait."
|
||||
no_tags: "Hey, you haven’t followed any tags! Continue anyway?"
|
||||
alright_ill_wait: "All right, I’ll wait."
|
||||
preparing_your_stream: "Preparing your personalized stream..."
|
||||
photo_uploader:
|
||||
looking_good: "OMG, you look awesome!"
|
||||
|
|
@ -118,9 +118,9 @@ en:
|
|||
size_error: "{file} is too large, maximum file size is {sizeLimit}."
|
||||
empty: "{file} is empty, please select files again without it."
|
||||
tags:
|
||||
wasnt_that_interesting: "OK, I suppose #<%= tagName %> wasn't all that interesting..."
|
||||
wasnt_that_interesting: "OK, I suppose #<%= tagName %> wasn’t all that interesting..."
|
||||
people:
|
||||
not_found: "and no one was found..."
|
||||
not_found: "... and no one was found"
|
||||
mention: "Mention"
|
||||
message: "Message"
|
||||
edit_my_profile: "Edit my profile"
|
||||
|
|
@ -129,9 +129,9 @@ en:
|
|||
is_sharing: "<%= name %> is sharing with you"
|
||||
is_not_sharing: "<%= name %> is not sharing with you"
|
||||
profile:
|
||||
edit: "edit"
|
||||
add_some: "add some"
|
||||
you_have_no_tags: "you have no tags!"
|
||||
edit: "Edit"
|
||||
add_some: "Add some"
|
||||
you_have_no_tags: "You have no tags!"
|
||||
ignoring: "You are ignoring all posts from <%= name %>."
|
||||
bio: "Bio"
|
||||
location: "Location"
|
||||
|
|
@ -156,7 +156,7 @@ en:
|
|||
unlike: "Unlike"
|
||||
reshare: "Reshare"
|
||||
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_posts: "Show all"
|
||||
hide_nsfw_posts: "Hide #nsfw posts"
|
||||
|
|
@ -180,7 +180,7 @@ en:
|
|||
other: "Show <%= count %> more comments"
|
||||
|
||||
followed_tag:
|
||||
title: "#Followed Tags"
|
||||
title: "#Followed tags"
|
||||
contacts_title: "People who dig these tags"
|
||||
add_a_tag: "Add a tag"
|
||||
follow: "Follow"
|
||||
|
|
@ -188,7 +188,7 @@ en:
|
|||
tags:
|
||||
follow: "Follow #<%= tag %>"
|
||||
following: "Following #<%= tag %>"
|
||||
stop_following: "Stop Following #<%= tag %>"
|
||||
stop_following: "Stop following #<%= tag %>"
|
||||
|
||||
header:
|
||||
home: "Home"
|
||||
|
|
@ -204,10 +204,10 @@ en:
|
|||
|
||||
search: "Search"
|
||||
|
||||
recent_notifications: "Recent Notifications"
|
||||
recent_notifications: "Recent notifications"
|
||||
mark_all_as_read: "Mark all as read"
|
||||
view_all: "View all"
|
||||
close: "close"
|
||||
close: "Close"
|
||||
|
||||
viewer:
|
||||
stop_following_post: "Stop following post"
|
||||
|
|
@ -217,7 +217,7 @@ en:
|
|||
reshare: "Reshare"
|
||||
reshared: "Reshared"
|
||||
comment: "Comment"
|
||||
home: "HOME"
|
||||
home: "Home"
|
||||
|
||||
poll:
|
||||
vote: "Vote"
|
||||
|
|
|
|||
|
|
@ -122,6 +122,6 @@ Feature: following and being followed
|
|||
And I add the person to my "Unicorns" aspect
|
||||
|
||||
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 "#message_button" within "#profile_buttons"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ Feature: posting
|
|||
Then I should see "#boss from the #boss tag page" within "body"
|
||||
|
||||
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
|
||||
Then I should not see "#boss" within "#tags_list"
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ Feature: User manages contacts
|
|||
And I follow "Cat People"
|
||||
And I click on selector "#change_aspect_name"
|
||||
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"
|
||||
|
||||
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
|
||||
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
|
||||
Given I am signed in
|
||||
|
|
@ -78,4 +78,4 @@ Feature: User manages contacts
|
|||
|
||||
And I click on my name in the header
|
||||
When I follow "Contacts"
|
||||
Then I should not see "Community Spotlight" within ".span9"
|
||||
Then I should not see "Community spotlight" within ".span9"
|
||||
|
|
|
|||
|
|
@ -20,25 +20,25 @@ Feature: oembed
|
|||
Scenario: Post an unsecure video link
|
||||
Given I expand the publisher
|
||||
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
|
||||
And I should see "http://mytube.com/watch?v=M3r2XDceM6A&format=json" within ".stream_element"
|
||||
|
||||
Scenario: Post an unsecure rich-typed link
|
||||
Given I expand the publisher
|
||||
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
|
||||
And I should see "http://myrichtube.com/watch?v=M3r2XDceM6A&format=json" within ".stream_element"
|
||||
|
||||
Scenario: Post a photo link
|
||||
Given I expand the publisher
|
||||
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"
|
||||
|
||||
Scenario: Post an unsupported text link
|
||||
Given I expand the publisher
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ Feature: posting from the main page
|
|||
And ".options_and_submit" is hidden
|
||||
When I expand the publisher
|
||||
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"
|
||||
|
||||
Scenario: post a text-only message to all aspects
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ Feature: new user registration
|
|||
When I follow "awesome_button"
|
||||
And I reject the alert
|
||||
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, I’ll wait."
|
||||
|
||||
Scenario: new user skips the setup wizard
|
||||
When I follow "awesome_button"
|
||||
|
|
@ -44,7 +44,7 @@ Feature: new user registration
|
|||
And I confirm the alert
|
||||
Then I should be on the stream page
|
||||
When I submit the publisher
|
||||
Then "Hey everyone, I’m #NewHere." should be post 1
|
||||
Then "Hey everyone, I’m #newhere." should be post 1
|
||||
|
||||
Scenario: new user with some tags posts first status message
|
||||
When I fill in the following:
|
||||
|
|
@ -54,7 +54,7 @@ Feature: new user registration
|
|||
And I follow "awesome_button"
|
||||
Then I should be on the stream page
|
||||
When I submit the publisher
|
||||
Then "Hey everyone, I’m #NewHere. I’m interested in #rockstar." should be post 1
|
||||
Then "Hey everyone, I’m #newhere. I’m interested in #rockstar." should be post 1
|
||||
|
||||
Scenario: closing a popover clears getting started
|
||||
When I follow "awesome_button"
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
And I click to report the post
|
||||
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
|
||||
Given I expand the publisher
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ Feature: Unfollowing
|
|||
|
||||
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"
|
||||
|
||||
When I sign out
|
||||
|
|
|
|||
|
|
@ -6,19 +6,19 @@ Feature: Viewing my activity on the steam mobile page
|
|||
|
||||
Background:
|
||||
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
|
||||
And I sign in as "alice@alice.alice" on the mobile website
|
||||
|
||||
Scenario: Show my activity empty
|
||||
When I open the drawer
|
||||
And I follow "My Activity"
|
||||
Then I should see "My Activity"
|
||||
And I should not see "Hello! i am #newhere"
|
||||
And I follow "My activity"
|
||||
Then I should see "My activity"
|
||||
And I should not see "Hello! I am #newhere"
|
||||
|
||||
Scenario: Show post on my activity
|
||||
When I click on selector "a.image_link.like_action.inactive"
|
||||
And I open the drawer
|
||||
And I follow "My Activity"
|
||||
Then I should see "My Activity"
|
||||
And I should see "Hello! i am #newhere" within ".ltr"
|
||||
And I follow "My activity"
|
||||
Then I should see "My activity"
|
||||
And I should see "Hello! I am #newhere" within ".ltr"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Feature: Naviguate between pages using the header menu and the drawer
|
|||
|
||||
Scenario: naviguate to the stream page
|
||||
When I open the drawer
|
||||
And I follow "My Activity"
|
||||
And I follow "My activity"
|
||||
And I click on selector "#header_title"
|
||||
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
|
||||
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
|
||||
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
|
||||
When I open the drawer
|
||||
And I follow "My Activity"
|
||||
Then I should see "My Activity" within "#main"
|
||||
And I follow "My activity"
|
||||
Then I should see "My activity" within "#main"
|
||||
|
||||
Scenario: naviguate to my mentions page
|
||||
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
|
||||
Given "bob@bob.bob" has a public post with text "bob's text"
|
||||
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"
|
||||
And I follow "Besties"
|
||||
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
|
||||
Given "bob@bob.bob" has a public post with text "bob is da #boss"
|
||||
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"
|
||||
And I follow "#boss"
|
||||
Then I should see "bob is da #boss" within "#main_stream"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Feature: reactions mobile post
|
|||
And I sign in as "bob@bob.bob" on the mobile website
|
||||
|
||||
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 "a.image_link.like_action.inactive"
|
||||
Then I should see a "a.image_link.like_action.active"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ Feature: resharing from the mobile
|
|||
And I confirm the alert
|
||||
Then I should see a "a.image_link.reshare_action.active"
|
||||
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
|
||||
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
|
||||
Then I should see a "a.image_link.reshare_action.active"
|
||||
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
|
||||
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 sign in as "bob@bob.bob"
|
||||
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 sign in as "eve@eve.eve" on the mobile website
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ When /^I click on "([^"]*)" aspect edit icon$/ do |aspect_name|
|
|||
end
|
||||
|
||||
When /^I select only "([^"]*)" aspect$/ do |aspect_name|
|
||||
click_link 'My Aspects'
|
||||
click_link 'My aspects'
|
||||
within('#aspects_list') do
|
||||
click_link 'Deselect all'
|
||||
current_scope.should have_no_css '.selected'
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ describe("app.views.AspectsDropdown", function(){
|
|||
Diaspora.I18n.reset({
|
||||
'aspect_dropdown': {
|
||||
'select_aspects': "Select aspects",
|
||||
'all_aspects': "All Aspects",
|
||||
'all_aspects': "All aspects",
|
||||
'toggle': {
|
||||
'zero': "Select aspects",
|
||||
'one': "In <%= count %> aspect",
|
||||
|
|
|
|||
Loading…
Reference in a new issue