LiittleCookie/valitron
1
0
Fork 0
mirror of https://github.com/vlucas/valitron.git synced 2025-12-31 07:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lang and langDir to have default values

Browse Source
This commit is contained in:
Marcos Neves 2013-08-16 23:05:24 -03:00
parent 611f264885
commit e23ebf6277
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Valitron/Validator.php
View File

@ -40,9 +40,9 @@ class Validator
} }
// set lang in the follow order: constructor param, static::$_lang, defaul to en // set lang in the follow order: constructor param, static::$_lang, defaul to en
$lang = $lang ?: static::$_lang ?: 'en'; $lang = $lang ?: static::lang();
// set langDir in the follow order: constructor param, static::$_langDir, default to package lang dir // set langDir in the follow order: constructor param, static::$_langDir, default to package lang dir
$langDir = $langDir ?: static::$_langDir ?: dirname(dirname(__DIR__)) . '/lang'; $langDir = $langDir ?: static::langDir();
static::langDir($langDir); static::langDir($langDir);
static::lang($lang); static::lang($lang);
@ -60,7 +60,7 @@ class Validator
$langDir = static::langDir(); $langDir = static::langDir();
static::$_ruleMessages = require rtrim($langDir, '/') . '/' . $lang . '.php'; static::$_ruleMessages = require rtrim($langDir, '/') . '/' . $lang . '.php';
} }
return static::$_lang; return static::$_lang ?: 'en';
} }
/** /**
@ -71,7 +71,7 @@ class Validator
if($dir !== null) { if($dir !== null) {
static::$_langDir = $dir; static::$_langDir = $dir;
} }
return static::$_langDir; return static::$_langDir ?: dirname(dirname(__DIR__)) . '/lang';
} }
/** /**