Merge remote-tracking branch 'origin/cake3' into master

# Conflicts:
#	resources/locales/de/tools.po

resources/locales/de/tools.po

@@ -736,6 +736,9 @@ msgstr ""
 msgid "List {0}"
 msgstr ""
 
+msgid "Inter"
+msgstr "Inter"
+
 msgid "valErrProvideCurrentPwd"
 msgstr "Bitte das bisherige Passwort eingeben"
 

resources/locales/en/tools.po

@@ -689,3 +689,6 @@ msgstr "Please provide the current password."
 
 msgid "valErrCurrentPwdIncorrect"
 msgstr "The current password is not correct"
+
+msgid "Inter"
+msgstr "Inter"

resources/locales/tools.pot

@@ -184,3 +184,5 @@ msgstr ""
 msgid "publishedNotYet"
 msgstr ""
 
+msgid "Inter"
+msgstr "Inter"

src/View/Helper/FormatHelper.php

@@ -186,7 +186,7 @@ class FormatHelper extends Helper {
 		} elseif ($value == static::GENDER_MALE) {
 			$icon = $this->icon('male', $options, $attributes);
 		} else {
-			$icon = $this->icon('genderless', $options, $attributes + ['title' => __d('tools', 'Unknown')]);
+			$icon = $this->icon('genderless', $options, $attributes + ['title' => __d('tools', 'Inter')]);
 		}
 
 		return $icon;

tests/TestCase/View/Helper/FormatHelperTest.php

@@ -209,7 +209,7 @@ class FormatHelperTest extends TestCase {
 	public function testGenderIcon() {
 		$result = $this->Format->genderIcon(0);
 
-		$expected = '<i class="icon icon-genderless fa fa-genderless" title="Unknown" data-placement="bottom" data-toggle="tooltip"></i>';
+		$expected = '<i class="icon icon-genderless fa fa-genderless" title="Inter" data-placement="bottom" data-toggle="tooltip"></i>';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Format->genderIcon(1);

tests/bootstrap.php

@@ -29,7 +29,7 @@ define('TESTS', ROOT . DS . 'tests' . DS);
 define('WWW_ROOT', ROOT . DS . 'webroot' . DS);
 define('CONFIG', __DIR__ . DS . 'config' . DS);
 
-ini_set('intl.default_locale', 'de-DE');
+ini_set('intl.default_locale', 'de_DE');
 
 require_once 'vendor/cakephp/cakephp/src/basics.php';
 require_once 'vendor/autoload.php';