Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/254160
Change subject: Update privacy policy and agreement questions
......................................................................
Update privacy policy and agreement questions
Bug: T116113
Change-Id: I121eb8ac9866e9587861a4e0f92e5a45a2e4afc2
---
M data/db/migrations/20151119-update-questions-for2016.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/templates/apply.html
M src/Wikimania/Scholarship/Forms/Apply.php
5 files changed, 40 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/60/254160/1
diff --git a/data/db/migrations/20151119-update-questions-for2016.sql
b/data/db/migrations/20151119-update-questions-for2016.sql
index 6fd1b55..3ab9280 100644
--- a/data/db/migrations/20151119-update-questions-for2016.sql
+++ b/data/db/migrations/20151119-update-questions-for2016.sql
@@ -5,7 +5,6 @@
ADD COLUMN wm15 TINYINT(1) DEFAULT NULL
AFTER wm14;
-
-- Drop unused columns
ALTER TABLE scholarships DROP COLUMN howheard;
@@ -13,3 +12,14 @@
ALTER TABLE scholarships
ADD COLUMN scholarship VARCHAR(32) DEFAULT NULL
AFTER id;
+
+-- Rename two checkbox labels for sake of consistency
+ALTER TABLE scholarships CHANGE willgetvisa agree1 TINYINT(1) NOT NULL DEFAULT
'0';
+ALTER TABLE scholarships CHANGE agreestotravelconditions agree2 TINYINT(1) NOT
NULL DEFAULT '0';
+
+-- Add columns for new fields in Application Agreement section
+ALTER TABLE scholarships
+ ADD COLUMN agree3 TINYINT(1) NOT NULL DEFAULT '0' AFTER agree2,
+ ADD COLUMN agree4 TINYINT(1) NOT NULL DEFAULT '0' AFTER agree3,
+ ADD COLUMN agree5 TINYINT(1) NOT NULL DEFAULT '0' AFTER agree4
+ ;
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 97fb797..c5bf384 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -63,8 +63,11 @@
, goals TEXT
, presentation TINYINT(1) DEFAULT NULL
, presentationTopic TEXT
- , willgetvisa TINYINT(1) NOT NULL DEFAULT '0'
- , agreestotravelconditions TINYINT(1) NOT NULL DEFAULT '0'
+ , agree1 TINYINT(1) NOT NULL DEFAULT '0'
+ , agree2 TINYINT(1) NOT NULL DEFAULT '0'
+ , agree3 TINYINT(1) NOT NULL DEFAULT '0'
+ , agree4 TINYINT(1) NOT NULL DEFAULT '0'
+ , agree5 TINYINT(1) NOT NULL DEFAULT '0'
, wmfAgreeName VARCHAR(255)
, wmfAgreeGuardian VARCHAR(255) DEFAULT NULL
, notes TEXT
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 09cb0af..0e3ee45 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -34,7 +34,7 @@
"form-intro-faq": "<a
href='//wikimania2016.wikimedia.org/wiki/Scholarships/FAQ'
target='_blank'>Frequently asked questions</a>",
"form-scholarship-type": "Type of Scholarship",
- "form-scholarship": "This year for Wikimania 2016, the Wikimedia
Foundation will be offering Partial scholarships which will cover all
registration fees (which includes accommodation during Wikimania); however,
these partial scholarships will NOT cover travel or incidental expenses. In
contrast, Full scholarships will cover travel, registration and incidental
expenses.<br/>Please indicate which type of Wikimania Foundation scholarship
are you applying for. Note that those who choose Either a Partial or Full
scholarship will be considered according to the Selection rules (link TBD).",
+ "form-scholarship": "This year for Wikimania 2016, the Wikimedia
Foundation will be offering Partial scholarships which will cover all
registration fees (which includes accommodation during Wikimania); however,
these partial scholarships will NOT cover travel or incidental expenses. In
contrast, Full scholarships will cover travel, registration and incidental
expenses.\n Please indicate which type of Wikimania Foundation scholarship are
you applying for. Note that those who choose Either a Partial or Full
scholarship will be considered according to the Selection rules (link TBD).",
"form-scholarship-full": "I am applying for a Full scholarship.",
"form-scholarship-either": "I am applying for either a Partial or Full
scholarship.",
"form-scholarship-partial": "I am applying for a Partial scholarship.",
@@ -61,8 +61,11 @@
"form-contribution-error": "Please explain your involvement and
contributions in projects other than Wikimedia projects.",
"form-experience-error": "Please provide information about how you
share your experiences with the community.",
"form-collaboration-error": "Please provide information about your
collaborations with other Wikimedians or Wikimedia organizations",
- "form-willgetvisa-error": "To proceed, please agree to the visa
requirements.",
- "form-agreestotravelconditions-error": "To proceed, please agree to the
travel booking agreement.",
+ "form-agree1-error": "To proceed, please agree to the visa
requirements.",
+ "form-agree2-error": "To proceed, please agree to the travel booking
agreement.",
+ "form-agree3-error": "To proceed, please agree to using the grant
exclusively for travel.",
+ "form-agree4-error": "To proceed, please agree to abide by the Friendly
space policy.",
+ "form-agree5-error": "To proceed, please agree that the information you
provided is true and accurate.",
"form-wmfagree-error": "To proceed, please agree to the applicant
rights condition.",
"form-wmfAgreeName-error": "Please fill in your full name in the given
field to agree to the terms and conditions.",
"form-engage10-error": "Please select how you have engaged in the
Wikimedia movement",
@@ -127,16 +130,19 @@
"form-presentation-topic": "If you have submitted or will submit a
presentation, please provide a link to your presentation or proposal title:",
"form-agree": "Application agreement",
- "form-visa": "If I am awarded and accept a grant, I will be responsible
for obtaining a travel visa, if necessary, prior to travel to Mexico City.",
- "form-travel-conditions": "If I am awarded and accept a grant, I agree
to use the travel booking service provided and paid for by the Wikimedia
Foundation.",
+ "form-agree1": "If I am awarded and accept a grant, I will be
responsible for obtaining a travel visa, if necessary, prior to travel to
Mexico City.",
+ "form-agree2": "If I am awarded and accept a grant, I agree to use the
travel booking service provided and paid for by the Wikimedia Foundation.",
+ "form-agree3": "If I am awarded and accept a grant, I agree to use the
grant exclusively for my travel expenses. I promise to reimburse the Wikimedia
Foundation for any unspent or improperly spent funds.",
+ "form-agree4": "If I am awarded and accept a grant, I agree to abide by
the Wikimedia Foundation <a
href=\"https://wikimediafoundation.org/wiki/Friendly_space_policy\";
target=\"blank\">Friendly Space Policy</a>. If I am found in violation of this
policy and asked to leave, I agree to be responsible for any changes in my own
travel expenses.",
+ "form-agree5": "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 grant recipients 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 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": "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. \n Please indicate whether or not you
would like your information shared with other, independent Wikimedia movement
organizations.",
"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 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-rights1": "I as an applicant for a Wikimedia Foundation ('WMF')
scholarship relating to my participation in the 2016 Wikimania conference
hosted in Esino Lario, hereby acknowledge and affirmatively consent to the
following as a prerequisite to the consideration of my 2016 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=\"//wikimania2016.wikimedia.org/wiki/Scholarship_committee\">https://wikimania2016.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'.",
diff --git a/data/templates/apply.html b/data/templates/apply.html
index c74d32f..f7f4f16 100644
--- a/data/templates/apply.html
+++ b/data/templates/apply.html
@@ -147,8 +147,11 @@
<fieldset>
<legend>{{ 'form-agree'|message }}</legend>
- {{ forms.checkbox( ctx, 'form-visa', 'willgetvisa', { 'required':true } )
}}
- {{ forms.checkbox( ctx, 'form-travel-conditions',
'agreestotravelconditions', { 'required':true } ) }}
+ {{ forms.checkbox( ctx, 'form-agree1', 'agree1', { 'required':true } ) }}
+ {{ forms.checkbox( ctx, 'form-agree2', 'agree2', { 'required':true } ) }}
+ {{ forms.checkbox( ctx, 'form-agree3', 'agree3', { 'required':true } ) }}
+ {{ forms.checkbox( ctx, 'form-agree4', 'agree4', { 'required':true,
'escape':false } ) }}
+ {{ forms.checkbox( ctx, 'form-agree5', 'agree5', { 'required':true } ) }}
</fieldset>
<fieldset>
diff --git a/src/Wikimania/Scholarship/Forms/Apply.php
b/src/Wikimania/Scholarship/Forms/Apply.php
index fcf98e9..d2ed6d0 100644
--- a/src/Wikimania/Scholarship/Forms/Apply.php
+++ b/src/Wikimania/Scholarship/Forms/Apply.php
@@ -118,8 +118,11 @@
) );
// Application agreement
- $this->expectTrue( 'willgetvisa' );
- $this->expectTrue( 'agreestotravelconditions' );
+ $this->expectTrue( 'agree1' );
+ $this->expectTrue( 'agree2' );
+ $this->expectTrue( 'agree3' );
+ $this->expectTrue( 'agree4' );
+ $this->expectTrue( 'agree5' );
// Privacy
$this->expectTrue( 'wmfagree' );
@@ -248,7 +251,7 @@
'wm05', 'wm06', 'wm07', 'wm08', 'wm09', 'wm10', 'wm11',
'wm12', 'wm13', 'wm14', 'wm15',
'presentation', 'presentationTopic',
- 'willgetvisa', 'agreestotravelconditions',
+ 'agree1', 'agree2', 'agree3', 'agree4', 'agree5',
'wmfAgreeName', 'wmfAgreeGuardian'
);
--
To view, visit https://gerrit.wikimedia.org/r/254160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I121eb8ac9866e9587861a4e0f92e5a45a2e4afc2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <nihar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
