jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332068 )
Change subject: link scholarship committee and correct link for faq
......................................................................
link scholarship committee and correct link for faq
Change-Id: Ic8d3f9bbb40771932cfcc969bee3400f453759f6
---
M data/i18n/en.json
M data/templates/base.html
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 6c84992..9e0c9a5 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -150,7 +150,7 @@
"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 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=\"https://wikimediafoundation.org/\";>Wikimedia Foundation</a>.",
+ "form-review": "All information contained in this application will be
reviewed by the members of the <a
href=\"https://wikimania2017.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-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-rights-heading": "Applicant Rights & Consent to Data Processing
and Transfer",
diff --git a/data/templates/base.html b/data/templates/base.html
index 10e30bf..fbbd291 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -78,7 +78,7 @@
<div class="hr"><hr/></div>
<div class="container text-right">
<ul class="footer-links">
- <li><a
href="http://wikimania2016.wikimedia.org/wiki/Scholarships/FAQ";>{{
'footer-faq'|message }}</a></li>
+ <li><a
href="http://wikimania2017.wikimedia.org/wiki/Scholarships/FAQ";>{{
'footer-faq'|message }}</a></li>
<li><a href="{{ urlFor( 'credits' ) }}">{{ 'footer-credits'|message
}}</a></li>
<li><a href="{{ urlFor( 'privacy' ) }}">{{ 'footer-privacy'|message
}}</a></li>
<li class="last"><a href="{{ urlFor( 'contact' ) }}">{{
'footer-contact'|message }}</a></li>
--
To view, visit https://gerrit.wikimedia.org/r/332068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8d3f9bbb40771932cfcc969bee3400f453759f6
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Matanya <mata...@foss.co.il>
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
