diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
| commit | c89189697b9cd17a5c2df0f3794b12f5cb681655 (patch) | |
| tree | 083f6375b6a2005531effb42e053693d08c04f2f /plugins/MobileMessaging | |
| parent | afb1cb7b7ec20bf3c0213e2fcd8680a85686c6ff (diff) | |
| parent | cf2f71f36ffa139aec60a219aeb3748af66f477e (diff) | |
Merge branch 'master' into 5940_testRenamingAndCorrectFolders
Conflicts:
tests/PHPUnit/phpunit.xml.dist
Diffstat (limited to 'plugins/MobileMessaging')
| -rw-r--r-- | plugins/MobileMessaging/MobileMessaging.php | 3 | ||||
| -rw-r--r-- | plugins/MobileMessaging/lang/pl.json | 2 | ||||
| -rw-r--r-- | plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 884ff9b63a..ed57c259f9 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\MobileMessaging; use Piwik\Option; +use Piwik\Period; use Piwik\Piwik; use Piwik\Plugins\API\API as APIPlugins; use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging; @@ -177,7 +178,7 @@ class MobileMessaging extends \Piwik\Plugin } public function sendReport($reportType, $report, $contents, $filename, $prettyDate, $reportSubject, $reportTitle, - $additionalFiles) + $additionalFiles, Period $period = null, $force) { if (self::manageEvent($reportType)) { $parameters = $report['parameters']; diff --git a/plugins/MobileMessaging/lang/pl.json b/plugins/MobileMessaging/lang/pl.json index eaf82a7798..859635f564 100644 --- a/plugins/MobileMessaging/lang/pl.json +++ b/plugins/MobileMessaging/lang/pl.json @@ -1,11 +1,13 @@ { "MobileMessaging": { "PhoneNumbers": "Numery telefonu", + "Settings_APIKey": "Klucz API", "Settings_CountryCode": "Kod Państwa", "Settings_DeleteAccountConfirm": "Czy jesteś pewny, że chcesz skasowac to konto SMS?", "Settings_ManagePhoneNumbers": "Zarządzaj numerami telefonów", "Settings_PhoneNumber": "Numer telefonu", "Settings_PhoneNumbers_Add": "Dodaj nowy numer telefonu", + "Settings_SMSProvider": "Dostawca usługi SMS", "Settings_ValidatePhoneNumber": "Zatwierdź", "SMS_Content_Too_Long": "[zbyt długie]", "TopMenu": "Raporty Email & SMS" diff --git a/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php b/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php index 6d2eb9849b..f387534bf3 100644 --- a/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php +++ b/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php @@ -255,7 +255,7 @@ class MobileMessagingTest extends IntegrationTestCase \Piwik\Plugins\MobileMessaging\API::setSingletonInstance($stubbedAPIMobileMessaging); $mobileMessaging = new MobileMessaging(); - $mobileMessaging->sendReport(MobileMessaging::MOBILE_TYPE, $report, $reportContent, null, null, $reportSubject, null, null); + $mobileMessaging->sendReport(MobileMessaging::MOBILE_TYPE, $report, $reportContent, null, null, $reportSubject, null, null, null, false); \Piwik\Plugins\MobileMessaging\API::unsetInstance(); } |