Updated translations and small bug fixes

perchlabs · Jan 9, 2015 · dfe8d88 · dfe8d88
1 parent 2e39727
commit dfe8d88
Show file tree

Hide file tree

Showing 7 changed files with 243 additions and 271 deletions.
diff --git a/app/locale/de_DE/LC_MESSAGES/messages.po b/app/locale/de_DE/LC_MESSAGES/messages.po
diff --git a/app/locale/ru_RU/LC_MESSAGES/messages.po b/app/locale/ru_RU/LC_MESSAGES/messages.po
diff --git a/app/phalcon/common/library/CLI/Console.php b/app/phalcon/common/library/CLI/Console.php
@@ -79,10 +79,11 @@ public function handle($arguments = null)
         } catch (PrintHelpException $e) {
             if ($e->getCode() == 1) {
                 $this->printHelpRecommend($e->getMessage());
+                exit(1);
             } else {
                 $this->printHelp($e->getCmdDef(), $e->getSpecs());
+                exit(0);
             }
-            exit(1);
         }
     }
 

diff --git a/app/phalcon/common/library/CLI/Task.php b/app/phalcon/common/library/CLI/Task.php
@@ -75,13 +75,11 @@ protected function isSystemUserInGroup($userName, $groupName)
     {
         $userNameEsc = escapeshellarg($userName);
         $cmd = "groups $userNameEsc";
-        // echo "$cmd\n";
         exec($cmd, $output, $ret);
         if ($ret !== 0) {
             error_log('Unable to determine the groups this user belongs to.');
             exit(1);
         }
-        // echo $output[0] . "\n";
 
         $parts = explode(':', $output[0]);
         $parts = trim($parts[1]);
@@ -281,5 +279,4 @@ private function changeProcessToWebUser()
         return true;
     }
 
-
 }
diff --git a/app/phalcon/common/views/layouts/userspublic.volt b/app/phalcon/common/views/layouts/userspublic.volt
@@ -14,7 +14,6 @@
   </div>
 </div>
 {{ content() }}
-</div>
 {% if DEV %}<!--DEBUG_PANEL-->{% endif %}
 </body>
 </html>
diff --git a/app/phalcon/modules/cli/tasks/UserTask.php b/app/phalcon/modules/cli/tasks/UserTask.php
@@ -38,7 +38,6 @@ public function createAction($argv)
         $opts = $params['opts'];
 
         $emailParts = mailparse_rfc822_parse_addresses($emailRaw);
-error_log(var_export($emailParts, true));
         if (empty($emailParts) || $emailParts[0]['display'] == $emailParts[0]['address']) {
             throw new ArgumentValidationException('Email must be in form: display <address>', 1);
         }

diff --git a/dev/gulpfile.webpack.coffee b/dev/gulpfile.webpack.coffee
@@ -68,7 +68,7 @@ wpConf =
       '.js', '.coffee'
       '.html', '.hbs'
       '.css', '.scss', '.less'
-      '.json', '.yaml'
+      '.json', '.yml', '.yaml'
     ]
 
   resolveLoader:
@@ -133,7 +133,7 @@ wpConf =
       }
       {
         # YAML Loader
-        test: /\.yaml$/
+        test: /\.(yaml|yml)$/
         loader: "json!yaml"
       }
       {
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
       </div>
     </div>
     {{ content() }}
-    </div>
     {% if DEV %}<!--DEBUG_PANEL-->{% endif %}
     </body>
     </html>