[MediaWiki-commits] [Gerrit] Update the privacy policy - change (wikimedia/iegreview)

2015-11-23 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Update the privacy policy
..


Update the privacy policy

Bug: T96882
Change-Id: I38f8c46ba32a3d2c76c7be1a019c924135eafba7
---
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/privacy.html
3 files changed, 86 insertions(+), 3 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/i18n/en.json b/data/i18n/en.json
index fd7d5db..78aa775 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -34,7 +34,6 @@
"credits-page-logo": "The https://commons.wikimedia.org/wiki/File%3AIEG_glasses_lightblue.png\";>glasses
 logo is by Wikimedia Commons user Heatherawalls and used under the 
Creative Commons CC0 1.0 Universal Public Domain Dedication license.",
 
"privacy": "Privacy",
-   "privacy-page": "All personal information will be held strictly 
confidential by the grants reviewers and the http://wikimediafoundation.org\";>Wikimedia Foundation, in accordance 
to the Wikimedia Foundation http://wikimediafoundation.org/wiki/Privacy_policy\";>privacy 
policy.",
 
"footer-credits": "credits",
"footer-privacy": "privacy",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index 35b20c5..adecd8e 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -123,7 +123,6 @@
"password": "Input label, followed by text 
box.\n{{Identical|Password}}",
"password-username": "Input label, followed by authenticated user's 
username.\n{{Identical|Username}}",
"privacy": "Privacy page title",
-   "privacy-page": "Privacy policy page content.",
"proposal-summary": "Section title",
"proposals-edit-amount": "Input label, followed by text box.",
"proposals-edit-amount-placeholder": "Placeholder for input text box",
diff --git a/data/templates/privacy.html b/data/templates/privacy.html
index ce6e2ad..fc35e1e 100644
--- a/data/templates/privacy.html
+++ b/data/templates/privacy.html
@@ -8,7 +8,92 @@
 
   
 {{ 'privacy'|message }}
-{{ 'privacy-page'|message|raw }}
+  
+  
+Welcome!
+Welcome to the Wikimedia Foundation’s grant review application. The 
grant review app is a flexible scoring system for grant administrators and 
volunteers to review and score grant proposals.
+
+Definitions
+For the sake of clarity, "WMF", "us", "we", and "our" refer to the http://www.wikimediafoundation.org/";>Wikimedia Foundation; the "app" 
refers to the grant review application, and the "app privacy policy" refers to 
this document.
+"Personal information" means information you provide us or information 
we collect from you that could be used to personally identify you. To be clear, 
while we do not necessarily collect all of the following types of information, 
we consider at least the following to be "personal information" if it is 
otherwise nonpublic and can be used to identify you: (a) your real name, 
address, phone number, email address, password, identification number on 
government-issued ID, IP address, user-agent information, credit card number; 
(b) when associated with one of the items in subsection (a), any sensitive data 
such as date of birth, gender, sexual orientation, racial or ethnic origins, 
marital or familial status, medical conditions or disabilities, political 
affiliation, and religion; and (c) any of the items in subsections (a) or (b) 
when associated with your user account.
+
+Important Information
+
+By using the app, you agree to the terms of this grant review app 
privacy policy and the WMF https://wikimediafoundation.org/wiki/Terms_of_Use";>terms of use. 
Furthermore, by using the app, you consent to the collection, transfer, 
processing, storage, disclosure, and use of your information as described in 
this app privacy policy.
+
+If you do not agree to these terms, you may not use this app.
+
+If you have any questions or suggestions about the app privacy policy 
or WMF terms of use, please https://wikimediafoundation.org/wiki/Contact_us";>contact us.
+
+What This Policy Covers
+
+This app privacy policy applies to our collection and handling of 
information about you that we receive as a result of your use of the app. As a 
http://www.mediawiki.org/wiki/Wikimedia_Labs";>Wikimedia Labs 
project, the grant review app is http://wikimediafoundation.org/wiki/Privacy_policy#What_This_Privacy_Policy_Does_.26_Doesn.27t_Cover";>not
 covered by the general http://wikimediafoundation.org/wiki/Privacy_policy";>Wikimedia Privacy 
Policy. This app privacy policy only applies to use of this Wikimedia grant 
review application and does not cover use of any other Wikimedia projects, 
sites, or services.
+
+What Info We Collect
+We may collect information, including but not limited to:
+
+  User account information
+  User-submitted information
+  Information we collect re

[MediaWiki-commits] [Gerrit] Update the privacy policy - change (wikimedia/iegreview)

2015-10-18 Thread Niharika29 (Code Review)
Niharika29 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/247091

Change subject: Update the privacy policy
..

Update the privacy policy

Change-Id: I38f8c46ba32a3d2c76c7be1a019c924135eafba7
---
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/privacy.html
3 files changed, 177 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/iegreview 
refs/changes/91/247091/1

diff --git a/data/i18n/en.json b/data/i18n/en.json
index da16580..aee4326 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -34,7 +34,6 @@
"credits-page-logo": "The https://commons.wikimedia.org/wiki/File%3AIEG_glasses_lightblue.png\";>glasses
 logo is by Wikimedia Commons user Heatherawalls and used under the 
Creative Commons CC0 1.0 Universal Public Domain Dedication license.",
 
"privacy": "Privacy",
-   "privacy-page": "All personal information will be held strictly 
confidential by the grants reviewers and the http://wikimediafoundation.org\";>Wikimedia Foundation, in accordance 
to the Wikimedia Foundation http://wikimediafoundation.org/wiki/Privacy_policy\";>privacy 
policy.",
 
"footer-credits": "credits",
"footer-privacy": "privacy",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index 272ce4c..f649f95 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -120,7 +120,6 @@
"password": "Input label, followed by text 
box.\n{{Identical|Password}}",
"password-username": "Input label, followed by authenticated user's 
username.\n{{Identical|Username}}",
"privacy": "Privacy page title",
-   "privacy-page": "Privacy policy page content.",
"proposal-summary": "Section title",
"proposals-edit-amount": "Input label, followed by text box.",
"proposals-edit-amount-placeholder": "Placeholder for input text box",
diff --git a/data/templates/privacy.html b/data/templates/privacy.html
index ce6e2ad..058da84 100644
--- a/data/templates/privacy.html
+++ b/data/templates/privacy.html
@@ -8,8 +8,184 @@
 
   
 {{ 'privacy'|message }}
-{{ 'privacy-page'|message|raw }}
   
+  
+   Welcome! 
+   Welcome to the Wikimedia Foundation’s grant review application. The 
grant review app is a
+   flexible scoring system for grant administrators and volunteers to 
review and score grant proposals.
+
+  Definitions
+
+   For the sake of clarity, “WMF”, “us”, “we”, and “our” refer to the http://www.wikimediafoundation.org/";>Wikimedia Foundation;
+   the “app” refers to the grant review application, and the “app privacy 
policy” refers to this document.
+   
+   “Personal information” means information you provide us or information 
we collect from you
+   that could be used to personally identify you. To be clear, while we do 
not necessarily collect
+   all of the following types of information, we consider at least the 
following to be
+   “personal information” if it is otherwise nonpublic and can be used to 
identify you:
+   (a) your real name, address, phone number, email address, password, 
identification number on
+   government-issued ID, IP address, user-agent information, credit card 
number; (b) when associated
+   with one of the items in subsection (a), any sensitive data such as 
date of birth, gender,
+   sexual orientation, racial or ethnic origins, marital or familial 
status, medical conditions or disabilities,
+   political affiliation, and religion; and (c) any of the items in 
subsections (a) or (b) when associated
+   with your user account.
+
+  Important Information
+
+   By using the app, you agree to the terms of this grant review app 
privacy policy and the WMF https://wikimediafoundation.org/wiki/Terms_of_Use";>terms of use.
+   Furthermore, by using the app, you consent to the collection, transfer, 
processing, storage, disclosure,
+   and use of your information as described in this app privacy policy.
+   
+   If you do not agree to these terms, you may not use this app.
+   
+   If you have any questions or suggestions about the app privacy policy 
or WMF terms of use, please https://wikimediafoundation.org/wiki/Contact_us";>contact us.
+
+  What This Policy Covers
+
+   This app privacy policy applies to our collection and handling of 
information about you that we
+   receive as a result of your use of the app. As a http://www.mediawiki.org/wiki/Wikimedia_Labs";>Wikimedia Labs project, 
the grant review app is
+   http://wikimediafoundation.org/wiki/Privacy_policy#What_This_Privacy_Policy_Does_.26_Doesn.27t_Cover";>not
 covered by the general http://wikimediafoundation.org/wiki/Privacy_policy";>Wikimedia Privacy 
Policy. This app privacy policy only applies to use
+   of this Wikimedia grant review application and does not cover use of 
any other Wikimedia projects,
+   sites, or s