[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: More modifications to the form
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397804 )
Change subject: More modifications to the form
..
More modifications to the form
- Replaces one question with another (string change only)
- Adds a text field as a follow-up question to another (validation dependent)
Bug: T181072
Change-Id: I8f143d7324764f047bd0cdd37b1d4e34efe91114
---
A data/db/migrations/20171212-add-scholarship-orgs-field.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
M data/templates/review/view.html
M src/Forms/Apply.php
7 files changed, 37 insertions(+), 14 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/db/migrations/20171212-add-scholarship-orgs-field.sql
b/data/db/migrations/20171212-add-scholarship-orgs-field.sql
new file mode 100644
index 000..903a2ea
--- /dev/null
+++ b/data/db/migrations/20171212-add-scholarship-orgs-field.sql
@@ -0,0 +1,2 @@
+-- Add column for scholarship organizations people apply for
+ALTER TABLE scholarships ADD COLUMN scholarorgs VARCHAR(255) DEFAULT NULL
AFTER separatejury;
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 74523d9..2e43ecf 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -17,6 +17,7 @@
, typeENUM('partial', 'full', 'either') DEFAULT NULL
, chapteragreeTINYINT(1) NOT NULL DEFAULT '0'
, separatejuryTINYINT(1) NOT NULL DEFAULT '0'
+ , scholarorgs VARCHAR(255) DEFAULT NULL
, fname VARCHAR(32) DEFAULT NULL
, lname VARCHAR(32) DEFAULT NULL
, email VARCHAR(64) DEFAULT NULL
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 261706d..c1a8974 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -31,12 +31,12 @@
"deadline-passed": "Scholarship application deadline was February
20, 23:59 UTC.\nWe will notify applicants in April 2018 about the result
of their application.\nPlease see the scholarships
page on the wiki for more details.",
- "form-intro": "This is the application for sponsorship to attend https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>Wikimania
2018, 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.\nApplications may be submitted in any language, but
every applicant must provide evidence of English language abilities 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.\nThis is not a scholarship for university study. Applications
not obviously related to the conference will be discarded.\nPlease
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.\nPlease note that if you need more then 10 minutes to
complete this application, please draft your answers in a text editor,
reload this page and then copy-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.\nThe deadline to apply is February 20, 23:59
UTC. ",
+ "form-intro": "This is the application for sponsorship to attend https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>Wikimania
2018, 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.\nApplications may be submitted in any language, but
every applicant must provide evidence of English language abilities 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.\nPlease 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.\nPlease note that
if you need more then 10 minutes to complete this application, please
draft your answers in a text editor, reload this page and then copy
and paste your answers into corresponding fields before submitting. This
application may give
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: More modifications to the form
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397804 )
Change subject: More modifications to the form
..
More modifications to the form
- Replaces one question with another (string change only)
- Adds a text field as a follow-up question to another (validation dependent)
Bug: T181072
Change-Id: I8f143d7324764f047bd0cdd37b1d4e34efe91114
---
A data/db/migrations/20171212-add-scholarship-orgs-field.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/templates/apply.html
M data/templates/review/view.html
M src/Forms/Apply.php
6 files changed, 29 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/04/397804/1
diff --git a/data/db/migrations/20171212-add-scholarship-orgs-field.sql
b/data/db/migrations/20171212-add-scholarship-orgs-field.sql
new file mode 100644
index 000..903a2ea
--- /dev/null
+++ b/data/db/migrations/20171212-add-scholarship-orgs-field.sql
@@ -0,0 +1,2 @@
+-- Add column for scholarship organizations people apply for
+ALTER TABLE scholarships ADD COLUMN scholarorgs VARCHAR(255) DEFAULT NULL
AFTER separatejury;
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 74523d9..2e43ecf 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -17,6 +17,7 @@
, typeENUM('partial', 'full', 'either') DEFAULT NULL
, chapteragreeTINYINT(1) NOT NULL DEFAULT '0'
, separatejuryTINYINT(1) NOT NULL DEFAULT '0'
+ , scholarorgs VARCHAR(255) DEFAULT NULL
, fname VARCHAR(32) DEFAULT NULL
, lname VARCHAR(32) DEFAULT NULL
, email VARCHAR(64) DEFAULT NULL
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 261706d..4dbb8ef 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -31,7 +31,7 @@
"deadline-passed": "Scholarship application deadline was February
20, 23:59 UTC.\nWe will notify applicants in April 2018 about the result
of their application.\nPlease see the scholarships
page on the wiki for more details.",
- "form-intro": "This is the application for sponsorship to attend https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>Wikimania
2018, 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.\nApplications may be submitted in any language, but
every applicant must provide evidence of English language abilities 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.\nThis is not a scholarship for university study. Applications
not obviously related to the conference will be discarded.\nPlease
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.\nPlease note that if you need more then 10 minutes to
complete this application, please draft your answers in a text editor,
reload this page and then copy-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.\nThe deadline to apply is February 20, 23:59
UTC. ",
+ "form-intro": "This is the application for sponsorship to attend https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>Wikimania
2018, 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.\nApplications may be submitted in any language, but
every applicant must provide evidence of English language abilities 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.\nPlease 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.\nPlease note that
if you need more then 10 minutes to complete this application, please
draft your answers in a text editor, reload this page and then
copy-paste your answers into corresponding fields before submitting. This
application may give an error
