Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BLOCKED] Change "Marketplace" to "Yardsale" #79

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BLOCKED] Change "Marketplace" to "Yardsale" #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/templates/main_page/forms/announcement-form.js.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{{#hasBusinessFeeds}}
<p>In order to publicize your business, please post a deal in the marketplace.</p>
<div class="controls wide">
<button class="red-button transaction">Post to Marketplace</button>
<button class="red-button transaction">Post to Yardsale</button>
<a class="back" href="#">Back</a>
</div>
{{/hasBusinessFeeds}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/main_page/post-box.js.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<li class="transaction" data-tab="transaction">
<i class="icon"></i>
<div class="left">
Sell on the Marketplace<br />
Sell at the Yardsale<br />
<span>Post an item (or give it away for free!)</span>
</div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/shared/sidebar/your-town.js.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<li>
<a id="transactions" class="wire_filter" href="/{{community_slug}}/list/transactions">
<i class="icon"></i>
<span>Marketplace</span>
<span>Yardsale</span>
</a>
</li>

Expand Down
2 changes: 1 addition & 1 deletion app/templates/wire_items/feed-card.js.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{{#isSubscribed}}<a href="#" class="unsubscribe">Unsubscribe</a>{{/isSubscribed}}
{{/isOwner}}
{{#canEdit}}
<a href="#" class="transaction red-button">Sell on the Marketplace!</a>
<a href="#" class="transaction red-button">Sell on the Yardsale!</a>
<a href="#" class="edit">Edit Page</a>
{{/canEdit}}
</div>
Expand Down
12 changes: 6 additions & 6 deletions mail/text/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ spam_report_received_notification:
outro: Once again, we greatly apologize for any inconvenience that may have been encountered. If you continue to have issues, please feel free to respond to this e-mail, and a member of our technical team will assist you further.
thanks: Thank you very much for using The {{community_name}} CommonPlace!

welcome:
welcome:
intro: We are happy to hear you have joined your neighbors on {{community_name}}'s CommonPlace, a new web platform for local community engagement here in {{community_name}}. {{community_name}}'s CommonPlace is like an online bulletin for people who live in {{community_name}}, designed to make it really easy for you to share requests, offers and other information with your neighbors and to stay up-to-date with what's happening in {{community_name}}.

list-intro: |
Here are some platform features that you might be interested in using to get connected with your community:

post-feature-title: Neighborhood Posts
post-feature-desc: |
Need to borrow a ladder? Lost a cat? Looking for a babysitter or an electrician recommendation? See a downed wire in the neighborhood? Click "Post to Your Neighborhood" in the red box on the top left of the mainpage to post a message to all your neighbors. Have a ladder? Found the cat? Up for babysitting? Click on any neighborhood post and a reply box will appear for you to reply directly to your neighbor.
Expand All @@ -40,9 +40,9 @@ welcome:
<p>If you have any questions about CommonPlace, consider checking out the <a href="{{faq_url}}"><span>Frequently Asked Questions page</span></a>, and feel free to email {{organizer_email}} anytime. Also, please email us if you are interested in helping out with signing your neighbors up with CommonPlace. The more people in {{community_name}} that are on CommonPlace, the better a tool it is for neighbors in {{community_name}} to connect, so make sure to tell your neighbors to sign up at <a href="{{root_url}}"><span>{{root_url}}</span></a>.</p>

<p>Thanks again for joining {{community_name}}'s CommonPlace and thanks for being a great neighbor!</p>

<p>Cheers, <br> The {{community_name}} CommonPlace</p>

outro: |
If you have any questions about CommonPlace, consider checking out the <a href="{{faq_url}}"><span>Frequently Asked Questions page</span></a>, and feel free to email {{organizer_email}} anytime. Also, please email us if you are interested in helping out with signing your neighbors up with CommonPlace. The more people in {{community_name}} that are on CommonPlace, the better a tool it is for neighbors in {{community_name}} to connect, so make sure to tell your neighbors to sign up at <a href="{{root_url}}"><span>{{root_url}}</span></a>.

Expand Down Expand Up @@ -113,7 +113,7 @@ feed_invitation:
daily_bulletin:
posts-section-title: Recent Neighborhood Questions
group-posts-section-title: Recent Discussion Topics
transactions-section-title: Recent Marketplace Listings
transactions-section-title: Recent Yardsale Listings
events-section-title: Upcoming Community Events
announcements-section-title: Recent Community Announcements

Expand All @@ -135,7 +135,7 @@ daily_bulletin:
announce-action-title: Publicize an Announcement
announce-action-body: |
Does your business have a new promotion? Is your civic organization running a volunteer drive? Get the word out in tomorrow's Daily Bulletin!</p>

new-feed-action-title: Register a Community Feed
new-feed-action-body: |
Are you part of a community organization, business, municipal agency or cause that wants to send announcements and events through {{community_name}}'s CommonPlace?
Expand Down