jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403544 )
Change subject: Update 2018 privacy statement
......................................................................
Update 2018 privacy statement
Bug: T184659
Change-Id: I8855f0b5be076a34ad31767ac922480710184eff
---
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
3 files changed, 11 insertions(+), 21 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/i18n/en.json b/data/i18n/en.json
index c1a8974..8be766d 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -33,6 +33,7 @@
"form-intro": "<p>This is the application for sponsorship to attend <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania
2018</a>, the annual international conference centered on Wikimedia projects.
Awardees will receive a scholarship which will cover conference registration
fees, hotel, and roundtrip travel to Wikimania in Cape Town, South Africa, July
18-22, 2018.</p>\n<p><b>Applications may be submitted in any language</b>, but
every applicant must <b>provide evidence of English language abilities</b> that
are at a level which would enable them to participate in Wikimania, a
conference which is primarily conducted in English. Sufficient English
abilities could be demonstrated in the application itself or
elsewhere.</p>\n<p>Please carefully consider your financial needs before
applying for a scholarship to attend Wikimania. There are limited funds
available and many applicants do not have the financial means to attend
Wikimania without this opportunity. Thank you.</p>\n<p>Please note that
<strong>if you need more then 10 minutes to complete this application, please
draft your answers in a text editor</strong>, reload this page and then copy
and paste your answers into corresponding fields before submitting. This
application may give an error (\"Missing or invalid CSRF token\") if it is open
for more then 15 minutes before submitting.</p>\n<p>The deadline to apply is
<strong>January 22, 2018, 23:59 UTC</strong>.</p> ",
+ "form-intro-privacy": "For information about privacy and data-handling,
please review the <a
href=\"https://wikimediafoundation.org/wiki/Wikimania_2018_Application_Form_Privacy_Statement\";>application
privacy statement</a>.",
"form-intro-faq": "<a
href='https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships/FAQ'>Frequently
asked questions</a>",
"form-scholarship-type": "Type of Scholarship",
@@ -150,17 +151,13 @@
"form-info-true": "I certify that all of the information provided with
my application is true and accurate to the best of my knowledge and belief. The
Wikimedia Foundation reserves the right to require me to pay back all or part
of the grant if any of the information I provide is found to be untrue or
inaccurate.",
"form-privacy": "Privacy",
- "form-review": "All information contained in this application will be
reviewed by the members of the <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>Wikimania
Scholarship Committee</a>. All personal information will be held strictly
confidential by the Committee, and the <a
href=\"https://wikimediafoundation.org/\";>Wikimedia Foundation</a>.",
+ "form-privacy1": "Please read the <a
href=\"https://wikimediafoundation.org/wiki/Wikimania_2018_Application_Form_Privacy_Statement\";>application
privacy statement</a> for details about privacy and data-handling.",
+ "form-privacy2": "Wikimedia is a global organization committed to
promoting free and open knowledge. By completing the survey, you agree to the
collection, transfer, storage, processing and use of the collected information
in the United States and other places as may be necessary to carry out the
purposes and objectives discussed above. You also consent to the transfer of
information from the U.S. to other countries, which may have different or less
stringent data protection laws than your country, in order to carry out the
aforementioned purposes and objectives.",
"form-chapteragree": "<p>Wikimedia movement organizations (Chapters,
Thematic organizations, and User Groups) also offer scholarships for Wikimania,
separate from the Wikimedia Foundation Scholarship Program. While this
application is submitted for a Wikimedia Foundation Scholarship, a Wikimedia
movement organization may request access to applications that are relevant to
their country or community, for the purpose of selecting and awarding their
own, independently awarded scholarships.</p> \n Please indicate whether or not
you would like your information shared with other, independent Wikimedia
movement organizations.",
"form-separatejury": "Do you intend to apply to any local Chapter /
other movement organization(s) for scholarship funding to Wikimania 2018?",
"form-scholarorgs": "If so, please list the organizations below:",
- "form-rights-heading": "Applicant Rights & Consent to Data Processing
and Transfer",
- "form-rights1": "I as an applicant for a Wikimedia Foundation ('WMF')
scholarship relating to my participation in the 2018 Wikimania conference
hosted in Cape Town (South Africa), hereby acknowledge and affirmatively
consent to the following as a prerequisite to the consideration of my 2018
Wikimania scholarship application ('Application'):",
- "form-rights2":"(a) Any personal data or sensitive personal data that I
submit as part of or in relation to my Application (collectively 'my Data') may
be accessed and reviewed by: (i) WMF; (ii) members of a scholarship committee
made up of Wikimedia movement members, a representative list of which can be
found at: <a
href=\"https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee</a>
('Scholarship Committee'); and if you indicated that you want to be considered
for a WM Chapter or WM Thematic Org scholarship, (iii) official Wikimedia
Chapters, a representative list of which can be found at: <a
href=\"https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters\";>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_chapters</a>
('WM Chapters'), and official thematic organizations, a representative list of
which can be found at: <a
href=\"https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations\";>https://meta.wikimedia.org/wiki/Special:MyLanguage/Wikimedia_thematic_organizations</a>
('WM Thematic Orgs'); for the purposes of evaluating my Application.",
- "form-rights3":"(b) Any Data that I submit as a part of or in relation
to my Application may be collected, stored, used, modified, communicated,
archived, destroyed, or otherwise processed (collectively 'Processed' or
'Processing') by: (i) WMF; (ii) members of the Scholarship Committee; and if
you indicated that you want to be considered for a WM Chapter or WM Thematic
Org scholarship, (iii) WM Chapters and WM Thematic Orgs. My Data may be
retained by WMF until I request in writing to WMF that my Data be destroyed or
for as long as required by applicable law.",
- "form-rights4":"(c) My Data may be transmitted to or from: (i) WMF in
the United States; (ii) members of the Scholarship Committee in the country
which they reside; and if you indicated that you want to be considered for a WM
Chapter or WM Thematic Org scholarship, (iii) WM Chapters and/or WM Thematic
Orgs in the country which the organizations are based.",
- "form-wmfagree": "I agree to the statement of 'Applicant Rights &
Consent to Data Processing and Transfer'.",
+ "form-wmfagree": "As an applicant for a Wikimedia Foundation
scholarship relating to my participation in the 2018 Wikimania conference
hosted in Cape Town (South Africa), I hereby acknowledge and affirmatively
consent to the terms of the application privacy statement as a prerequisite to
the consideration of my 2018 Wikimania scholarship application.",
"form-wmfAgreeName": "Please enter your full name:",
"form-wmfAgreeGuardian": "If under 18 years old, please have a parent
or legal guardian enter his/her full name:",
"form-submit-app": "Submit application",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index b45ab75..c352502 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -33,6 +33,7 @@
"deadline-passed": "Content for site landing page after scholarship
request period has closed",
"form-intro": "Static content to be shown at the top of the scholarship
request form in a callout box",
"form-intro-faq": "Link to Scholarships/FAQ wiki
page.\n{{Identical|Frequently asked questions}}",
+ "form-intro-privacy": "Link to application privacy statement",
"form-scholarship-type": "Dropdown box label for scholarship type
question",
"form-scholarship": "Form section label",
"form-scholarship-full": "Scholarship type option",
@@ -137,16 +138,12 @@
"form-friendly-space": "Input label, preceeded by checkbox",
"form-info-true": "Input label, preceeded by checkbox",
"form-privacy": "Form section label\n{{Identical|Privacy}}",
- "form-review": "Static content in the application form",
+ "form-privacy1": "Static content in the application form, contains
legal wording",
+ "form-privacy2": "Static content in the application form, contains
legal wording",
"form-chapteragree": "Input label, followed by yes and no radio
buttons",
"form-separatejury": "Input label, followed by yes and no radio
buttons",
"form-scholarorgs": "Input label, followed by a text box",
- "form-rights-heading": "Static content in the application form",
- "form-rights1": "Static content in the application form, contains legal
wording",
- "form-rights2": "Static content in the application form, contains legal
wording",
- "form-rights3": "Static content in the application form, contains legal
wording",
- "form-rights4": "Static content in the application form, contains legal
wording",
- "form-wmfagree": "Input label, preceeded by checkbox, refers to
form-rights-heading and content",
+ "form-wmfagree": "Input label, preceeded by checkbox, refers to
form-privacy section content",
"form-wmfAgreeName": "Input label, followed by text box",
"form-wmfAgreeGuardian": "Input label, followed by text box",
"form-submit-app": "Form submission button",
diff --git a/data/templates/apply.html b/data/templates/apply.html
index 5891c03..b0892ef 100644
--- a/data/templates/apply.html
+++ b/data/templates/apply.html
@@ -69,6 +69,7 @@
<div class="jumbotron">
<div class="container">
{{ 'form-intro'|message|raw }}
+ <p class="text-center">{{ 'form-intro-privacy'|message|raw }}</p>
<p class="text-center">{{ 'form-intro-faq'|message|raw }}</p>
</div>
</div>
@@ -159,13 +160,8 @@
<fieldset>
<legend>{{ 'form-privacy'|message }}</legend>
- <p>{{ 'form-review'|message|raw }}</p>
-
- <h4>{{ 'form-rights-heading'|message }}</h4>
- <p>{{ 'form-rights1'|message|raw }}</p>
- <p>{{ 'form-rights2'|message|raw }}</p>
- <p>{{ 'form-rights3'|message|raw }}</p>
- <p>{{ 'form-rights4'|message|raw }}</p>
+ <p>{{ 'form-privacy1'|message|raw }}</p>
+ <p>{{ 'form-privacy2'|message }}</p>
{{ forms.checkbox( ctx, 'form-wmfagree', 'wmfagree', { 'required':true } )
}}
{{ forms.text( ctx, 'form-wmfAgreeName', 'wmfAgreeName', { 'required':true
} ) }}
--
To view, visit https://gerrit.wikimedia.org/r/403544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8855f0b5be076a34ad31767ac922480710184eff
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Niharika29 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
