Merge pull request #2938 from samsonasik/fix-2932

Fixes #2932 : Fix Translation key separated by dot
codeigniter4 · May 6, 2020 · 10207eb · 10207eb
2 parents 2e95838 + 72e03e7
commit 10207eb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/system/Language/Language.php b/system/Language/Language.php
@@ -163,6 +163,13 @@ public function getLine(string $line, array $args = [])
 			}
 		}
 
+		if ($output === null)
+		{
+			$row    = current(explode('.', $parsedLine));
+			$key    = substr($parsedLine, strlen($row) + 1);
+			$output = $this->language[$this->locale][$file][$row][$key] ?? null;
+		}
+
 		if ($output === null && strpos($this->locale, '-'))
 		{
 			[$locale] = explode('-', $this->locale, 2);

diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
@@ -321,4 +321,12 @@ public function testLanguageNestedArrayDefinition()
 		$this->assertEquals('e', $lang->getLine('Nested.a.b.c.d'));
 	}
 
+	public function testLanguageKeySeparatedByDot()
+	{
+		$lang = new SecondMockLanguage('en');
+		$lang->loadem('Foo', 'en');
+
+		$this->assertEquals('The fieldname field is very short.', $lang->getLine('Foo.bar.min_length1', ['field' => 'fieldname']));
+	}
+
 }