diff --git a/inc/page.php b/inc/page.php index 8bef491..bf1e5ee 100644 --- a/inc/page.php +++ b/inc/page.php @@ -12,7 +12,7 @@ class Page { $this->defaultlang = new en_US(); require_once './lang/' . $settings->lang . '.php'; - $lang_class = substr($settings->lang,0, strpos($settings->lang, ".")); // grab "en_US" from "en_US.utf8" + $lang_class = substr($settings->lang, 0, strpos($settings->lang, ".")); // grab "en_US" from "en_US.utf8" if ($lang_class !== "en_US" && class_exists($lang_class)) { $this->lang = new $lang_class; } else { diff --git a/inc/test/php/LangTest.php b/inc/test/php/LangTest.php index 221abea..06e145a 100644 --- a/inc/test/php/LangTest.php +++ b/inc/test/php/LangTest.php @@ -16,10 +16,11 @@ final class LangTest extends TestCase { echo("Testing $lang_class ($lang)... "); $instance = new $lang_class; - $this->assertTrue(is_array($instance->array)); + $this->assertIsArray($instance->array); + $this->assertNotEmpty($instance->array); + $this->assertContainsOnly("string", $instance->array); $count = sizeof($instance->array); - $this->assertTrue($count > 0); echo "Success. $count messages defined.\n"; }