Merge pull request #3 from pi-engine/develop

update 03-03-2015
pi-engine · Mar 3, 2015 · 1826886 · 1826886
2 parents 56cfc44 + c29e1d2
commit 1826886
Show file tree

Hide file tree

Showing 80 changed files with 8,054 additions and 7,198 deletions.
diff --git a/lib/Pi/View/Helper/ThemeAssemble.php b/lib/Pi/View/Helper/ThemeAssemble.php
@@ -201,34 +201,28 @@ public function renderStrategy($module)
         $headTitle = $this->view->headTitle();
         $separator = $headTitle->getSeparator();
 
-        // Head title for system module
-        if ('system' == $module || !Pi::service('module')->isActive($module)) {
-            if (!$headTitle->count()) {
-                $headTitle->set(Pi::config('sitename'));
-                $headTitle->setPostfix($separator . Pi::config('slogan'));
+        // Set postfix
+        $postfix = $headTitle->getPostfix();
+        if (!$postfix) {
+            $postfix = Pi::config('sitename');
+            if ($headTitle->count()) {
+                if ($module && 'system' != $module) {
+                    $moduleMeta = Pi::registry('module')->read($module);
+                    $postfix = $moduleMeta['title'] . $separator . $postfix;
+                }
             }
+            $postfix = $separator . $postfix;
+            $headTitle->setPostfix($postfix);
         }
         // Set head title
         if (!$headTitle->count()) {
             $headTitleStr = Pi::config('head_title', $module);
             if ($headTitleStr) {
                 $headTitle->set($headTitleStr);
+            } else {
+                $headTitle->set(Pi::config('slogan'));
             }
         }
-
-        // Set postfix
-        $postfix = $headTitle->getPostfix();
-        if (!$postfix) {
-            $postfix = Pi::config('sitename');
-            if ($module) {
-                $moduleMeta = Pi::registry('module')->read($module);
-                $postfix = $moduleMeta['title'] . $separator . $postfix;
-            }
-            if ($headTitle->count()) {
-                $postfix = $separator . $postfix;
-            }
-            $headTitle->setPostfix($postfix);
-        }
     }
 
     /**

diff --git a/usr/locale/fa/language.mo b/usr/locale/fa/language.mo
diff --git a/usr/locale/fa/language.po b/usr/locale/fa/language.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Timezone\n"
-"POT-Creation-Date: 2014-12-02 11:57+0330\n"
-"PO-Revision-Date: 2014-12-02 11:57+0330\n"
+"POT-Creation-Date: 2015-02-20 11:44+0330\n"
+"PO-Revision-Date: 2015-02-20 11:44+0330\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.3\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: /var/www/html/local/pi/pi-release-2.5.0/usr/locale/"

diff --git a/usr/locale/fa/timezone.mo b/usr/locale/fa/timezone.mo
diff --git a/usr/locale/fa/timezone.po b/usr/locale/fa/timezone.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Timezone\n"
-"POT-Creation-Date: 2014-12-02 11:57+0330\n"
-"PO-Revision-Date: 2014-12-02 11:57+0330\n"
+"POT-Creation-Date: 2015-02-20 11:44+0330\n"
+"PO-Revision-Date: 2015-02-20 11:44+0330\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.3\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: /var/www/html/local/pi/pi-release-2.5.0/usr/locale/"

diff --git a/usr/locale/fa/validator.mo b/usr/locale/fa/validator.mo
diff --git a/usr/locale/fa/validator.po b/usr/locale/fa/validator.po
diff --git a/usr/module/article/locale/fa/admin.mo b/usr/module/article/locale/fa/admin.mo
diff --git a/usr/module/article/locale/fa/admin.po b/usr/module/article/locale/fa/admin.po
diff --git a/usr/module/article/locale/fa/block.mo b/usr/module/article/locale/fa/block.mo
diff --git a/usr/module/article/locale/fa/block.po b/usr/module/article/locale/fa/block.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pi-block\n"
-"POT-Creation-Date: 2014-09-11 17:57+0330\n"
-"PO-Revision-Date: 2014-09-11 17:57+0330\n"
+"POT-Creation-Date: 2015-02-20 12:19+0330\n"
+"PO-Revision-Date: 2015-02-20 12:19+0330\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.3\n"
 "X-Poedit-KeywordsList: _b\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: /var/www/html/local/pi/pi-release-2.5.0/usr/module/"
@@ -23,6 +23,14 @@ msgstr "این تصویر پیش فرض پیشنهاد شده است"
 msgid "You should to add your own images and its title and description!"
 msgstr "شما باید تصاویر و عنوان و توضیحات خود را درج کنید"
 
+#: /var/www/html/local/pi/pi-release-2.5.0/usr/module/article/template/block/simple-search.phtml:11
+msgid "Keyword"
+msgstr "کلمات کلیدی"
+
+#: /var/www/html/local/pi/pi-release-2.5.0/usr/module/article/template/block/simple-search.phtml:13
+msgid "Search"
+msgstr "جستجو"
+
 #: /var/www/html/local/pi/pi-release-2.5.0/usr/module/article/template/block/submitter-statistics.phtml:17
 msgid "Today"
 msgstr "امروز"
@@ -38,11 +46,3 @@ msgstr "۳۰ روز"
 #: /var/www/html/local/pi/pi-release-2.5.0/usr/module/article/template/block/submitter-statistics.phtml:20
 msgid "All"
 msgstr "همه"
-
-#: /var/www/html/local/pi/pi-release-2.5.0/usr/module/article/template/block/simple-search.phtml:11
-msgid "Keyword"
-msgstr "کلمات کلیدی"
-
-#: /var/www/html/local/pi/pi-release-2.5.0/usr/module/article/template/block/simple-search.phtml:13
-msgid "Search"
-msgstr "جستجو"
diff --git a/usr/module/article/locale/fa/default.mo b/usr/module/article/locale/fa/default.mo