Permalink
Browse files

First batch of changes to change this to MicroPasts

  • Loading branch information...
portableant committed Aug 1, 2014
1 parent b93e81b commit 4c1c0c89ca82db604fa949141c8aa2ca6b6d4b29
Showing with 110 additions and 96 deletions.
  1. +1 −0 .gitignore
  2. +5 −3 Gemfile
  3. BIN app/assets/images/MP_SQUARE_notype.png
  4. BIN app/assets/images/about/AHRClogo.jpg
  5. BIN app/assets/images/about/bm_logo.png
  6. BIN app/assets/images/about/heads/adi.jpg
  7. BIN app/assets/images/about/heads/andy.jpg
  8. BIN app/assets/images/about/heads/chiara.jpg
  9. BIN app/assets/images/about/heads/daniel.jpg
  10. BIN app/assets/images/about/heads/temp.jpeg
  11. BIN app/assets/images/about/ucl-home_trans_small.png
  12. BIN app/assets/images/favicon.ico
  13. BIN app/assets/images/logo-head.png
  14. BIN app/assets/images/logo-micropasts.png
  15. BIN app/assets/images/logo.png
  16. BIN app/assets/images/micropasts.png
  17. BIN app/assets/images/powered_by_neighborly.png
  18. +3 −3 app/locales/core/simple_form.en.yml
  19. +5 −5 app/locales/core/site.en.yml
  20. +1 −1 app/locales/modules/channels-admin.en.yml
  21. +1 −1 app/locales/modules/controllers.en.yml
  22. +5 −5 app/locales/modules/devise.en.yml
  23. +7 −8 app/locales/modules/footer.en.yml
  24. +2 −2 app/locales/modules/header.en.yml
  25. +2 −2 app/locales/modules/payments-engines.en.yml
  26. +2 −2 app/locales/modules/words.en.yml
  27. +2 −2 app/locales/pages/companies/contacts/new.en.yml
  28. +2 −2 app/locales/pages/devise/registrations/new.en.yml
  29. +1 −1 app/locales/pages/devise/sessions/new.en.yml
  30. +1 −1 app/locales/pages/matches/new.en.yml
  31. +1 −1 app/locales/pages/projects/contributions/edit.en.yml
  32. +2 −2 app/locales/pages/projects/contributions/index.en.yml
  33. +2 −2 app/locales/pages/projects/contributions/new.en.yml
  34. +2 −2 app/locales/pages/projects/contributions/show.en.yml
  35. +3 −3 app/locales/pages/projects/index.en.yml
  36. +2 −2 app/locales/pages/projects/matches/show.en.yml
  37. +2 −2 app/locales/pages/projects/new.en.yml
  38. +1 −1 app/locales/pages/projects/project.en.yml
  39. +5 −5 app/locales/pages/projects/show.en.yml
  40. +2 −2 app/locales/pages/projects/start.en.yml
  41. +1 −1 app/locales/pages/rewards/index.en.yml
  42. +2 −2 app/locales/pages/users/set_email.en.yml
  43. +1 −1 app/locales/updates.en.yml
  44. +1 −1 app/views/devise/mailer/reset_password_instructions.en.html.slim
  45. +1 −1 app/views/layouts/email.html.slim
  46. +1 −1 app/views/notifications_mailer/new_user_registration.en.html.slim
  47. +2 −2 app/views/notifications_mailer/pending_contribution_project_unsuccessful.en.html.slim
  48. +1 −1 app/views/notifications_mailer/project_approved.en.html.slim
  49. +1 −1 app/views/notifications_mailer/project_in_wainting_funds.en.html.slim
  50. +2 −2 app/views/notifications_mailer/project_success.en.html.slim
  51. +2 −2 app/views/notifications_mailer/project_visible.en.html.slim
  52. +2 −2 app/views/notifications_mailer/project_visible_channel.en.html.slim
  53. +1 −1 app/views/notifications_mailer/subjects/adm_project_deadline.en.text.slim
  54. +1 −1 app/views/notifications_mailer/subjects/contribution_project_successful.en.text.slim
  55. +1 −1 app/views/notifications_mailer/subjects/contribution_project_unsuccessful.en.text.slim
  56. +1 −1 app/views/notifications_mailer/subjects/in_analysis_project.en.text.slim
  57. +1 −1 app/views/notifications_mailer/subjects/in_analysis_project_channel.en.text.slim
  58. +1 −1 app/views/notifications_mailer/subjects/new_project_visible.en.text.slim
  59. +1 −1 app/views/notifications_mailer/subjects/new_user_registration.en.text.slim
  60. +1 −1 app/views/notifications_mailer/subjects/payment_canceled_after_confirmed.en.text.slim
  61. +1 −1 app/views/notifications_mailer/subjects/payment_confirmed_after_finished_project.text.slim
  62. +1 −1 app/views/notifications_mailer/subjects/project_approved.en.text.slim
  63. +1 −1 app/views/notifications_mailer/subjects/project_in_wainting_funds.en.text.slim
  64. +1 −1 app/views/notifications_mailer/subjects/project_owner_contribution_confirmed.en.text.slim
  65. +1 −1 app/views/notifications_mailer/subjects/project_received.en.text.slim
  66. +1 −1 app/views/notifications_mailer/subjects/project_rejected.en.text.slim
  67. +1 −1 app/views/notifications_mailer/subjects/project_rejected_channel.en.text.slim
  68. +1 −1 app/views/notifications_mailer/subjects/project_visible_channel.en.text.slim
  69. +2 −2 app/views/static/faq.html.slim
  70. +1 −1 db/seeds.rb
  71. +3 −0 nbproject/project.properties
  72. +9 −0 nbproject/project.xml
View
@@ -33,3 +33,4 @@ spec/tmp/
# Secrets
.env
+/nbproject/private/
View
@@ -23,9 +23,10 @@ gem 'pg_search'
gem 'schema_plus'
# Payment engines
-gem 'neighborly-balanced-creditcard', github: 'neighborly/neighborly-balanced-creditcard', branch: :master
-gem 'neighborly-balanced-bankaccount', github: 'neighborly/neighborly-balanced-bankaccount', branch: :master
-gem 'neighborly-balanced', github: 'neighborly/neighborly-balanced', branch: :master
+#gem 'neighborly-balanced-creditcard', github: 'neighborly/neighborly-balanced-creditcard', branch: :master
+#gem 'neighborly-balanced-bankaccount', github: 'neighborly/neighborly-balanced-bankaccount', branch: :master
+#gem 'neighborly-balanced', github: 'neighborly/neighborly-balanced', branch: :master
+gem 'catarse_paypal_express', github: 'MicroPasts/catarse_paypal_express', branch: :master
# Neigbhor.ly Engines
gem 'neighborly-admin', github: 'neighborly/neighborly-admin', branch: :master
@@ -60,6 +61,7 @@ gem 'catarse_monkeymail', '~> 0.1.6'
gem 'simple_form', '~> 3.0.2'
gem 'auto_html', '~> 1.6.1'
gem 'kaminari'
+gem 'font-awesome-sass'
# Uploads
gem 'carrierwave', '~> 0.9.0'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -41,8 +41,8 @@ en:
user:
bio: 'Short Bio'
password: 'New Password'
- newsletter: 'Receive occasional e-mail newsletters from Neighbor.ly'
- new_project: 'Email me when new projects are added to Neighbor.ly'
+ newsletter: 'Receive occasional e-mail newsletters from MicroPasts'
+ new_project: 'Email me when new projects are added to MicroPasts'
profile_type: 'Display me as a'
phone_number: 'Phone number'
location: 'City, State'
@@ -88,7 +88,7 @@ en:
about: "Tell us the story of your project. What is it, why does it matter, and why should contributors care about it? Here is the place for details."
category: "Which category best describes your project?"
expires_at: "How long will your campaign run? Research shows a 'Goldilocks window' between 30 and 60 days."
- goal: "What is the total goal for the project? Keep in mind Neighbor.ly's platform fee, and the cost to fulfill perks you offer. No commas, currency sign or decimal."
+ goal: "What is the total goal for the project? Keep in mind MicroPasts' platform fee, and the cost to fulfill perks you offer. No commas, currency sign or decimal."
first_contributions: "Having contributors already in hand is critical to the success of your project. You can list contributions already received, or contributions you can count on to come in on day 1 of your project. If you have neither, explain who you plan to target with your campaign."
headline: "In 130 characters or less, summarize your project. Why should contributors support it?"
name: "Be concise and objective. 8 words or less."
@@ -1,11 +1,11 @@
en:
facebook_locale: 'en_US'
site:
- title: "Invest in civic projects you care about"
+ title: "Crowdfunding for archaeology and heritage projects"
meta_title: "%{title} · %{company_name}"
- description: "Crowdfunding for civic projects. Invest in places and civic projects you care about."
- keywords: "Neighbor.ly, crowdfunding, project, community, open source, civic"
+ description: "Crowdfunding for heritage"
+ keywords: "MicroPasts, crowdfunding, project, community, open source, civic"
email:
- contact: 'howdy@neighbor.ly'
+ contact: 'info@micropasts.org'
ograph:
- description: "Neighbor.ly is the best way for people, companies, and foundations to invest in the places and civic projects they care about."
+ description: "Help us fund your high quality research data about our human history"
@@ -7,7 +7,7 @@ en:
menu: 'Dashboard'
total_projects:
title: 'Total Projects'
- hint: 'Number of Projects on Plataform'
+ hint: 'Number of Projects on Platform'
total_subscribers:
title: 'Total Followers'
management:
@@ -10,7 +10,7 @@ en:
new:
no_reward: "No perks! I just want to help out the project!"
create:
- error: 'Oh noez! There was an error processing your contribution. Please try again.'
+ error: 'There was an error processing your contribution. Please try again.'
credits_checkout:
no_credits: "You don't have enough credits to help greenlight this project."
success: "You successfully contributed using credits."
@@ -1,7 +1,7 @@
en:
devise:
confirmations:
- confirm: "Please check your email for confirmation instructions. Didn't receive? <a href='%{link}'>Click here to resend.</a>"
+ confirm: "Please check your email for confirmation instructions. If you did not receive them, then <a href='%{link}'>access this link to resend.</a>"
confirmed: "Your account was successfully confirmed."
send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
@@ -33,16 +33,16 @@ en:
updated_not_active: "Your password was changed successfully."
registrations:
destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
- signed_up: 'Welcome to the neighborhood! Please <a href="%{link}">complete your profile</a> so we can talk you up, and give you full credit for being awesome!'
+ signed_up: 'Welcome to MicroPasts! Please <a href="%{link}">complete your profile</a> so we can talk you up, and give you full credit for being awesome!'
signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
updated: "You updated your account successfully."
sessions:
- signed_in: "Howdy, neighbor!"
- signed_in_custom: 'Howdy, neighbor! Please <a href="%{link}">complete your profile</a> so we can talk you up, and give you full credit for being awesome!'
- signed_out: "Bye neighbor. Safe travels, happy trails."
+ signed_in: "Welcome to MicroPasts"
+ signed_in_custom: 'Welcome. Please <a href="%{link}">complete your profile</a> so we can talk you up, and give you full credit for being awesome!'
+ signed_out: "Goodby for now, we hope you will return"
unlocks:
send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
@@ -1,17 +1,16 @@
en:
layouts:
footer:
- quick_links: 'Good to know...'
- about: 'Meet the Neighbors'
+ quick_links: 'About the project'
+ about: 'Project team'
discover: 'Find Projects'
- start_campaign: 'Start a Campaign'
+ start_campaign: 'Submit a project'
how_it_works: 'How It Works'
contact: 'Contact Us'
faq: 'FAQ / Help'
legal: 'Privacy Policy'
terms: 'Terms of Use'
- stay_in_touch: "Won't you be our neighbor?"
- built_with_love: 'Built with &#x2764; in KC &amp; SF &nbsp; | &nbsp; <a href="https://github.com/neighborly/neighborly" target="blank">Open source</a>'
- now_accepting_proposals: 'Now accepting proposals!'
- now_accepting_proposals_text: 'Have a civic project in need of funding? A streetcar, for example, or bike share, or perhaps a ball park? If you know of a civic project that could use a creative down payment...'
- we_want_to_help: 'We want to help!'
+ stay_in_touch: 'Become a Micropasts member?'
+ built_with_love: 'An <a href="http://www.ahrc.ac.uk/">AHRC funded project</a> | Built on top of the <a href="http://github.com/luminopolis/neighborly">Neighborly project</a> and the original <a href="http://github.com/catarse/catarse">Catarse from Brazil</a> | <a href="http://github.com/findsorguk/MicroPasts">Open source and on Github</a>'
+
+
@@ -1,10 +1,10 @@
en:
layouts:
header:
- start_campaign: 'Start A Campaign'
+ start_campaign: 'Start a campaign'
discover: 'Discover'
about: 'Learn'
sign-out: 'Log out'
- sign-up: 'Join'
+ sign-up: 'Join us'
sign-in: 'Log in'
@@ -2,9 +2,9 @@ en:
payments:
common:
terms: 'By contributing to this project I agree with the %{link}.'
- terms-link: 'Terms & Conditions of Use'
+ terms-link: 'Terms and Conditions of Use'
confirm: 'Confirm payment'
proccessing: 'Processing...'
error:
- title: "Sorry, something must've gone wrong."
+ title: "Sorry, something has gone wrong."
name: 'Please reload this page and try again.'
@@ -7,8 +7,8 @@ en:
sending: 'Sending...'
remaining_plural: 'left'
remaining_singular: 'left'
- neighbor_plural: 'neighbors'
- neighbor_singular: 'neighbor'
+ neighbor_plural: 'contributors'
+ neighbor_singular: 'contributor'
confirm: 'Are you sure?'
detele: 'Delete'
cancel: 'Cancel'
@@ -2,5 +2,5 @@ en:
companies:
contacts:
new:
- title: 'Request a Demo'
- summary: 'Want to do more with your cause marketing and CSR dollars? Looking for civic sponsorship opportunities? Our mission is to help companies like yours be more neighborly. Find out how! Schedule a free demo and tour.'
+ title: 'Request a Demonstration'
+ summary: 'If you want to know more about how this platform might help your project, we can demonstrate how this works.'
@@ -5,7 +5,7 @@ en:
have_account_html: "Already joined? <strong>%{link}</strong>"
titles:
site: 'Sign up'
- header: 'Join the Neighborhood'
+ header: 'Join the MicroPasts community'
links:
login: "Log in <i class='icon-et-right-circled'></i>"
form:
@@ -14,5 +14,5 @@ en:
hint:
password_length: '*must be at least 6 characters.'
inputs:
- submit: 'Join the Neighborhood'
+ submit: 'Join the MicroPasts community'
facebook: 'Sign up with Facebook'
@@ -2,7 +2,7 @@ en:
devise:
sessions:
new:
- no_account_html: "Not in the neighborhood yet? <strong>%{link}</strong>"
+ no_account_html: "Not a MicroPasts member yet? <strong>%{link}</strong>"
titles:
site: 'Log in'
header: 'Log in'
@@ -14,7 +14,7 @@ en:
title: "Earn media views"
description: "Engage a whole new audience and get recognized for contributing to a worthy project."
i_pledge_to_match: "I pledge to match"
- for_each_1_raised_between: "for each $1 raised between"
+ for_each_1_raised_between: "for each £1 raised between"
and: "and"
up_to: "up to"
form:
@@ -8,5 +8,5 @@ en:
i_want_pay_fees: "I'll cover the transaction fees"
reward:
title: 'Your perk'
- tooltip-text: "Thank you for supporting <strong>%{project_name}</strong>! In order to make the most of your contribution, we ask that you please consider covering the electronic transaction fees. Though entirely optional, doing so makes a big difference and is greatly appreciated.<br /><strong>Note that ACH debit fees cap at $5.</strong>"
+ tooltip-text: "Thank you for supporting <strong>%{project_name}</strong>! In order to make the most of your contribution, we ask that you please consider covering the electronic transaction fees. Though entirely optional, doing so makes a big difference and is greatly appreciated."
to_be_matched_by: 'To be matched by:'
@@ -7,6 +7,6 @@ en:
match_progress: '%{pledged} so far of %{ceil}'
load_more: 'Load More'
contribution:
- anonymous_contribution: "Anonymous neighbor"
- no_reward: "This neighbor did not select a reward"
+ anonymous_contribution: "Anonymous contributor"
+ no_reward: "This contributor did not select a reward"
matched_by: 'Matched by %{matchers}'
@@ -3,8 +3,8 @@ en:
contributions:
new:
title: "Contribute to this campaign"
- minimum_value: 'Contribute any amount as little as $10'
+ minimum_value: 'Contribute any amount as little as £10'
subtitle: "Select your amount or select your reward."
contribute: "Contribute to <strong>%{project_name}</strong>"
contribution_with_matches: "Contributions to <strong>%{project_name}</strong> will be matched by %{matchers}"
- submit: 'Review & Proceed'
+ submit: 'Review and Proceed'
@@ -6,10 +6,10 @@ en:
one_more_step: 'One more step, neighbor! Please verify your account to complete your contribution.'
thank_you: 'thank you, neighbor! %{project_name} is only possible with the support of people like you.'
share: 'You can still help %{project_owner_name} by telling others about your contribution!'
- twitter-text: 'I just contributed %{value} to %{name} on @Neighborly: %{project_url}'
+ twitter-text: 'I just contributed %{value} to %{name} on @micropasts: %{project_url}'
bankaccount:
title: 'You contributed using a new bank account. Please verify your account to complete your contribution.'
steps:
- first: 'We will make two small deposits (each less than $1.00) to this account. Deposits may take 1-2 business days to appear.'
+ first: 'We will make two small deposits (each less than £1.00) to this account. Deposits may take 1-2 business days to appear.'
second: 'Once the deposits have been made, you will receive an email with a link to verify your account using the two deposit amounts.'
third: 'Once your account has been verified, your contribution will be processed and automatically reflected in the campaign you contributed to.'
@@ -10,13 +10,13 @@ en:
coming_soon: 'Coming Soon'
with_active_matches: 'Active Matches'
join:
- join_the_neighborhood: 'Join the Neighborhood'
+ join_the_neighborhood: 'Join the MicroPasts community'
already_joined: 'Already joined? %{link}.'
sign_in: 'Sign in'
hero:
title: 'Invest in the places you care about.'
- subtitle_html: "Howdy, Neighbor! Exciting things happening here at Neighbor.ly. For two years, we've been developing a way that will make it easy and fun to <span>invest</span> in communities. Curious about what's next? Sign up below and be among the first to know."
- email_placeholder: 'YOUR EMAIL'
+ subtitle_html: "Welcome! Exciting things happening for MicroPasts. Curious about what's next? Sign up below and be among the first to know."
+ email_placeholder: 'Your email'
submit: 'Submit'
start-one:
title: 'Have a community project in need of funding?'
@@ -4,13 +4,13 @@ en:
show:
title: 'Thank you'
one_more_step: 'One more step, neighbor! Please verify your account to enable your match.'
- thank_you: 'Thank you, Neighbor! Your match for %{project_name} will be live and enable others to multiply their impact.'
+ thank_you: 'Thank you! Your match for %{project_name} will be live and enable others to multiply their impact.'
share: 'You can still help %{project_owner_name} by telling others about your match!'
twitter-text: "I'll match up to %{value} for contributions to %{name} from %{starts_at} until %{finishes_at}. %{project_url}"
bankaccount:
title: "You've pledged a match using a new bank account. Please verify your account to begin matching contributions."
steps:
- first: 'We will make two small deposits (each less than $1.00) to this account. Deposits may take 1-2 business days to appear.'
+ first: 'We will make two small deposits (each less than £1.00) to this account. Deposits may take 1-2 business days to appear.'
second: 'Once the deposits have been made, you will receive an email with a link to verify your account using the two deposit amounts.'
third: 'Once your account has been verified, the funds pledged will be withdrawn and your match will automatically be set live.'
fourth: 'If the total amount you pledged is not used by the challenge match end date specified, you will be refunded the remaining balance.'
@@ -19,7 +19,7 @@ en:
description: 'What would you like to call it? A short, catchy, shareable title works best!'
campaign_type:
title: 'Project Type'
- description: 'What funding model would you like to use? <br /><br/> <strong>Every Dollar Counts:</strong> The project is funded whether or not the goal is reached. <br /> <strong>All or None:</strong> You must reach your goal by the end of your project to receive funds.'
+ description: 'What funding model would you like to use? <br /><br/> <strong>Every pound Counts:</strong> The project is funded whether or not the goal is reached. <br /> <strong>All or None:</strong> You must reach your goal by the end of your project to receive funds.'
goal:
title: 'Project Goal'
description: 'How much do you need to raise in order to complete your project? Please enter a number without commas.'
@@ -33,6 +33,6 @@ en:
title: 'The Story'
description: "Tell us what you can about your project. Why do you need the community's help?"
organization_type:
- title: 'Organization Type'
+ title: 'Organisation Type'
description: 'Please select the type that best describes the entity who will receive funds raised.'
accept_terms_html: 'By submitting, you agree to the %{link}.'
@@ -5,6 +5,6 @@ en:
completed: 'Completed'
soon: 'Coming Soon'
share:
- twitter-text: "Check out the project %{name} #%{hash_tag} that I support on @Neighborly"
+ twitter-text: "Check out the project %{name} #%{hash_tag} that I support on @micropasts"
twitter: 'Tweet'
facebook: 'Share'
Oops, something went wrong.

0 comments on commit 4c1c0c8

Please sign in to comment.