lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #260 issues with privacy policy (#261)

Browse Source 
* <fixed privacy policy workflow>

* <fixed privacy policy workflow>

* <changed rspec tests to handle new privacy flow>

* <changed rspec tests to handle new privacy flow>

* <deleted previous term validation due to changed workflow>

* <fixed code style>

* <reverted configuration settings>

* <Updated terms and conditions for existing users (not omniauth)>

* <Fix code style>

* <Fixed privacy policy for omniauth>

* <Fixed Travis C.I test>

* <Minor code changes>

* <Undo routes.rb change>

* <reconfigured routes.rb>
This commit is contained in:
John Ma
2018-09-14 14:33:58 -04:00
committed by Jesus Federico
parent 4fb1a008ca
commit d83ec1a027
10 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/locales/en.yml
View File

@@ -17,6 +17,10 @@
# English (en) locale.
en:
activerecord:
attributes:
user:
accepted_terms: "Terms and Conditions"
bigbluebutton: BigBlueButton
cancel: Cancel
copy: Copy
@@ -152,7 +156,8 @@ en:
title: Signup
with: Signup with %{provider}
terms:
accept: I accept the terms and conditions.
accept: I accept the %{href}
accept_existing: I accept the terms and conditions
title: Terms and Conditions
test_install: >
This deployment is using a pre-configured testing server, you should replace this with your own.