jenkins-bot has submitted this change and it was merged.
Change subject: Split 'form-rights' text into four separate messages for easier
translation
......................................................................
Split 'form-rights' text into four separate messages for easier translation
Bug: T60768
Change-Id: I85a010fad98c90633c1a10d17522087fde242398
---
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
3 files changed, 12 insertions(+), 5 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 3ee7f25..c4ae719 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -134,7 +134,10 @@
"form-review": "All information contained in this application will be
reviewed by the members of the Wikimania Scholarship Committee. All personal
information will be held strictly confidential by the Committee, and the <a
href=\"//wikimediafoundation.org/\">Wikimedia Foundation</a>.",
"form-chapteragree": "I would like to be considered for a <a
href=\"https://meta.wikimedia.org/wiki/Wikimedia%20chapters\";>Wikimedia
chapter</a> or <a
href=\"https://meta.wikimedia.org/wiki/Wikimedia_thematic_organizations\";>thematic
organization</a> scholarship, and agree to share my information with chapters
and thematic organizations for purpose of selecting and awarding scholarships.",
"form-rights-heading": "Applicant Rights & Consent to Data Processing
and Transfer",
- "form-rights": "I as an applicant for a Wikimedia Foundation ('WMF')
scholarship relating to my participation in the 2015 Wikimania conference
hosted in Mexico City, hereby acknowledge and affirmatively consent to the
following as a prerequisite to the consideration of my 2015 Wikimania
scholarship application ('Application'):\n</p><p>\n(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=\"//wikimania2015.wikimedia.org/wiki/Scholarship_committee\">https://wikimania2015.wikimedia.org/wiki/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=\"//meta.wikimedia.org/wiki/Wikimedia_chapters\">https://meta.wikimedia.org/wiki/Wikimedia_chapters</a>
('WM Chapters'), and official thematic organizations, a representative list of
which can be found at: <a
href=\"//meta.wikimedia.org/wiki/Wikimedia_thematic_organizations\">https://meta.wikimedia.org/wiki/Wikimedia_thematic_organizations</a>
('WM Thematic Orgs'); for the purposes of evaluating my
Application.\n</p><p>\n(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.\n</p><p>\n(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-rights1": "I as an applicant for a Wikimedia Foundation ('WMF')
scholarship relating to my participation in the 2015 Wikimania conference
hosted in Mexico City, hereby acknowledge and affirmatively consent to the
following as a prerequisite to the consideration of my 2015 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=\"//wikimania2015.wikimedia.org/wiki/Scholarship_committee\">https://wikimania2015.wikimedia.org/wiki/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=\"//meta.wikimedia.org/wiki/Wikimedia_chapters\">https://meta.wikimedia.org/wiki/Wikimedia_chapters</a>
('WM Chapters'), and official thematic organizations, a representative list of
which can be found at: <a
href=\"//meta.wikimedia.org/wiki/Wikimedia_thematic_organizations\">https://meta.wikimedia.org/wiki/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-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:",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index e778eb2..f9ed227 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -123,7 +123,10 @@
"form-review": "Static content in the application form",
"form-chapteragree": "Input label, followed by yes and no radio buttons",
"form-rights-heading": "Static content in the application form",
- "form-rights": "Static content in the application form, contains legal
wording",
+ "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-wmfAgreeName": "Input label, followed by text box",
"form-wmfAgreeGuardian": "Input label, followed by text box",
diff --git a/data/templates/apply.html b/data/templates/apply.html
index 267666d..90a411d 100644
--- a/data/templates/apply.html
+++ b/data/templates/apply.html
@@ -148,9 +148,10 @@
{{ forms.yesNo( ctx, 'form-chapteragree', 'chapteragree', { 'escape':false
} ) }}
<h4>{{ wgLang.message( 'form-rights-heading' ) }}</h4>
- <p>
- {{ wgLang.message( 'form-rights' )|raw }}
- </p>
+ <p>{{ wgLang.message( 'form-rights1' )|raw }}</p>
+ <p>{{ wgLang.message( 'form-rights2' )|raw }}</p>
+ <p>{{ wgLang.message( 'form-rights3' )|raw }}</p>
+ <p>{{ wgLang.message( 'form-rights4' )|raw }}</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/182656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85a010fad98c90633c1a10d17522087fde242398
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <niharikakohl...@gmail.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
