Merge branch 'hotfix/1.3.6'

terminal42 · May 4, 2016 · c80129f · c80129f
2 parents 00c83f4 + 6002420
commit c80129f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,27 @@
 Notification Center Changelog
 ===========================
 
+Version 1.3.6 (2016-05-04)
+--------------------------
+
+### Fixed
+- Support the language variations (e.g. en-US) (#93)
+
+
 Version 1.3.5 (2016-03-02)
 --------------------------
 
 ### Fixed
 - The extension is now compatible with PHP7 (see #86)
 
 
+Version 1.3.4 (2016-02-09)
+--------------------------
+
+### Improved
+- The extension is now compatible with Contao 4
+
+
 Version 1.3.3 (2016-01-15)
 --------------------------
 

diff --git a/library/NotificationCenter/ContaoHelper.php b/library/NotificationCenter/ContaoHelper.php
@@ -59,7 +59,7 @@ public function sendRegistrationEmail($intId, $arrData, &$objModule)
         $objNotification = \NotificationCenter\Model\Notification::findByPk($objModule->nc_notification);
 
         if ($objNotification !== null) {
-            $objNotification->send($arrTokens);
+            $objNotification->send($arrTokens, $GLOBALS['TL_LANGUAGE']);
 
             // Disable the email to admin because no core notification has been sent
             $objModule->reg_activate = true;
@@ -108,7 +108,7 @@ public function sendPersonalDataEmail($objUser, $arrData, $objModule)
         $objNotification = \NotificationCenter\Model\Notification::findByPk($objModule->nc_notification);
 
         if ($objNotification !== null) {
-            $objNotification->send($arrTokens);
+            $objNotification->send($arrTokens, $GLOBALS['TL_LANGUAGE']);
         }
     }
 

diff --git a/library/NotificationCenter/Model/Language.php b/library/NotificationCenter/Model/Language.php
@@ -28,6 +28,9 @@ public static function findByMessageAndLanguageOrFallback(Message $objMessage, $
     {
         $t = static::$strTable;
 
+        // Support the language variations (e.g. en-US)
+        $strLanguage = str_replace('-', '_', $strLanguage);
+
         $arrColumns = array("$t.pid=?", "($t.language=? OR $t.fallback=1)");
         $arrValues  = array($objMessage->id, $strLanguage);
         $arrOptions = array('order' => 'fallback');

diff --git a/modules/ModulePasswordNotificationCenter.php b/modules/ModulePasswordNotificationCenter.php
@@ -65,7 +65,7 @@ protected function sendPasswordLink($objMember)
 		$arrTokens['domain'] = \Idna::decode(\Environment::get('host'));
 		$arrTokens['link'] = \Idna::decode(\Environment::get('base')) . \Environment::get('request') . (($GLOBALS['TL_CONFIG']['disableAlias'] || strpos(\Environment::get('request'), '?') !== false) ? '&' : '?') . 'token=' . $confirmationId;
 
-		$objNotification->send($arrTokens);
+		$objNotification->send($arrTokens, $GLOBALS['TL_LANGUAGE']);
 		$this->log('A new password has been requested for user ID ' . $objMember->id . ' (' . $objMember->email . ')', __METHOD__, TL_ACCESS);
 
 		// Check whether there is a jumpTo page