Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/190371
Change subject: Merge branch 'master' into drupal
......................................................................
Merge branch 'master' into drupal
All of these and a whole bunch of localisation patches too!
3a4f4f5 Move some logging functions into DonationLogger
7ca14dd Really send NarrativeStatement1
06e150e Killall original_
d9d8a8b Add contribution tracking to Worldpay CC statement
b9f7d78 Move more validation out of GatewayPage and into the adapter.
94a9eb3 Cleanup
30e1558 Fix form width for consistent cross-device display
d4dd607 Delete lightbox form
de5a222 Kill PayflowPro, part 3
3d19b9a Kill PayflowPro, part 2
f387266 Kill PayflowPro, part 1
a24f68f Lots of validation cleanup
1eed0e8 Burn a small book of unused code
ddf77be More validation testing
e2d309b Only normalize if there's data.
b2612ef Don't fallback from unknown currency
5c014ee Inherit from DonationInterfaceTestCase
0534980 revert to MWException
1dd7150 Don't feed the instructions results
a0bede4 DataValidator uses GatewayAdapter object
455f404 eliminate premium_language
eac414b assign credit and blame
962c1da Test for missing message translations
40c8c2e TestingGenericAdapter can do normal validation, not just fakey
e3fae8c Move function into the base class
957f1a2 sprinkle comments
b96718d remove and comment unused code
2b14a09 Split test gateway forms into a single file per class
2763c86 Split test adapters into a file per class
afa7311 Normalize minor include file naming
ab4523d Differentiate rapidhtml failure cases
540f46a Annotation in generated forms links to source file
5eedd5d Add Alipay form
dddc2bb log which transaction we're about to initiate
6b6acc1 Style inputs missing 'type' like text inputs
40c1a1e Fix green box width on some forms
08dbef3 Reset CC radios, disable 'continue' with CC buttons
34c50c9 Tooltip explanation of CVV field for WorldPay
a3f055f Don't apply new input styles to radio buttons
17bc13d (FR #2293) Force LTR on credit-card fields
cee3013 Re-center CC icons in narrow screen view
f87f838 Even out vertical layout on small devices
0b926b4 Improve payments form layout
6c0e16f Get rid of unused colspan=2 cruft
89d4e7c Prevent background color from bleeding to right margin
a848405 Use class_alias to select WmfFramework
68a0658 Add vendor submodule and update composer files
ed706f1 Satisfy structure tests
94cef69 Disable clicking credit card type radio LI
dfa81e5 Make the entire li around CC type buttons clickable
c997ab9 Prevent double clicks on gc cc forms (take 2)
ae5137f Globalcollect form and iframe content css changes
ce48eaf Revert "Prevent double clicks on gc cc forms"
16faedc i18n the remaining State fields
7deedab (FR #2288) Improved i18n for Canada
ae6b600 (FR #2288) Use i18n for State field label
bc81ae2 Clean up a little logspam
133bad7 Prevent double clicks on gc cc forms
c3b177d Test that two GC API requests send different info
c647026 Deploy once Lithuania is on the Euro.
9cb0ad9 Clean up GlobalCollect style sheet
0716718 Update input and select styling for GlobalCollect
185df75 Tweaking the merchant reference
52171b2 Prevents us from hurting ourselves when trying to log things during
object construction.
3132eb8 Logging changes for DonationInterface
c6d6739 Fewer normal user errors at LOG_ERR level
d44bfe4 Use country-specific address forms for BPay
0079d3e Remove AU State label and newline email
ec4ad74 Fix unwanted display of country dropdown
f259b13 Add new forms for WorlPay - Big English countries
4161426 remote unused stylepath cruft
0158aa4 Fix input direction for rtl langs when sitedir=ltr
d7d4281 Move GC iframe css into code
b32b169 Comment out Bootstrap glyphicons
7ac4fd1 typo-O
a1f0fb9 Removing language cruft and copypasta in usin tests
7fbd627 Changing legal text in en
111375e Remove infuriating error level and accompanying TMI
6f8c50c Add dropdown test for WorldPay credit card entry
20c3a44 Add form partials for WP button copy
3875e25 Add i18n for API module help
2f4fdff Make state field wider, zip smaller to compensate
858bc2f Put "state" placeholder in state dropdown
Change-Id: Ie55e83e41cc3464a964148ba0a3b4f96c1e218b8
---
D gateway_common/WmfFramework.mediawiki.php
1 file changed, 0 insertions(+), 74 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/71/190371/1
diff --git a/gateway_common/WmfFramework.mediawiki.php
b/gateway_common/WmfFramework.mediawiki.php
deleted file mode 100644
index 0224538..0000000
--- a/gateway_common/WmfFramework.mediawiki.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<<<<<<< HEAD (a1944f Merge remote-tracking branch 'origin/master' into
drupal)
-=======
-<?php
-
-class WmfFramework_Mediawiki {
- static function debugLog( $identifier, $msg ) {
- wfDebugLog( $identifier, $msg );
- }
-
- static function getIP() {
- global $wgRequest;
- return $wgRequest->getIP();
- }
-
- static function getHostname() {
- return wfHostname();
- }
-
- static function formatMessage($message_identifier /*, ... */ ) {
- return call_user_func_array( 'wfMessage', func_get_args()
)->text();
- }
-
- static function runHooks($func, $args) {
- return wfRunHooks($func, $args);
- }
-
- static function getLanguageCode() {
- global $wgLang;
- return $wgLang->getCode();
- }
-
- static function isUseSquid() {
- global $wgUseSquid;
- return $wgUseSquid;
- }
-
- static function setupSession($sessionId=false) {
- wfSetupSession();
- }
-
- static function validateIP($ip) {
- return IP::isValid( $ip );
- }
-
- static function isValidBuiltInLanguageCode( $code ) {
- return Language::isValidBuiltInCode( $code );
- }
-
- static function validateEmail( $email ) {
- return Sanitizer::validateEmail( $email );
- }
-
- /**
- * wmfMessageExists returns true if a translatable message has been
defined
- * for the string and language that have been passed in, false if none
is
- * present.
- * @param string $msg_key The message string to look up.
- * @param string $language A valid mediawiki language code.
- * @return boolean - true if message exists, otherwise false.
- */
- public static function messageExists( $msg_key, $language ) {
- return wfMessage( $msg_key )->inLanguage( $language )->exists();
- }
-
- static function getUserAgent() {
- return Http::userAgent();
- }
-
- static function isPosted() {
- global $wgRequest;
- return $wgRequest->wasPosted();
- }
-}
->>>>>>> BRANCH (184389 Localisation updates from https://translatewiki.net.)
--
To view, visit https://gerrit.wikimedia.org/r/190371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie55e83e41cc3464a964148ba0a3b4f96c1e218b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: drupal
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
