Merge pull request #502 from tarasfrompir/patch-7

Доработка к предыдущим реквестам
sergejey · Apr 4, 2019 · 25db6b6 · 25db6b6
2 parents 2a55298 + 1a67e69
commit 25db6b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/modules/devices/processCommand.inc.php b/modules/devices/processCommand.inc.php
@@ -56,13 +56,7 @@
         'graminfo_as_text' => true,
     );
     $dir = ROOT . 'lib/phpmorphy/dicts';
-    if (SETTINGS_SITE_LANGUAGE == 'ru') {
+    $lang = SETTINGS_SITE_LANGUAGE_CODE;
-        $lang = 'ru_RU';
-    } else if (SETTINGS_SITE_LANGUAGE == 'ua') {
-        $lang = 'uk_UA';
-    } else {
-        $lang = 'en_EN';
-    }
     try {
         $morphy = new phpMorphy($dir, $lang, $opts);
         $this->morphy =& $morphy;

diff --git a/modules/patterns/patterns.class.php b/modules/patterns/patterns.class.php
@@ -717,11 +717,7 @@ function checkPattern($id, $from_user_id = 0)
                 );
                 $dir = ROOT . 'lib/phpmorphy/dicts';
 
-                if (SETTINGS_SITE_LANGUAGE == 'ru') {
+                $lang = SETTINGS_SITE_LANGUAGE_CODE;
-                    $lang = 'ru_RU';
-                } else {
-                    $lang = 'en_EN';
-                }
 
                 try {
                     $morphy = new phpMorphy($dir, $lang, $opts);
@@ -939,4 +935,4 @@ function dbInstall($data)
 * TW9kdWxlIGNyZWF0ZWQgRGVjIDEzLCAyMDExIHVzaW5nIFNlcmdlIEouIHdpemFyZCAoQWN0aXZlVW5pdCBJbmMgd3d3LmFjdGl2ZXVuaXQuY29tKQ==
 *
 */
-?>
+?>