Fix a few consistency errors in scp

include/class.nav.php

@@ -142,8 +142,8 @@ class StaffNav {
                     $subnav[]=array('desc'=>__('My Profile'),'href'=>'profile.php','iconclass'=>'users');
                     break;
                 case 'users':
-                    $subnav[] = array('desc' => 'User Directory', 'href' => 'users.php', 'iconclass' => 'teams');
-                    $subnav[] = array('desc' => 'Organizations', 'href' => 'orgs.php', 'iconclass' => 'departments');
+                    $subnav[] = array('desc' => __('User Directory'), 'href' => 'users.php', 'iconclass' => 'teams');
+                    $subnav[] = array('desc' => __('Organizations'), 'href' => 'orgs.php', 'iconclass' => 'departments');
                     break;
                 case 'kbase':
                     $subnav[]=array('desc'=>__('FAQs'),'href'=>'kb.php', 'urls'=>array('faq.php'), 'iconclass'=>'kb');

scp/attachment.php

@@ -20,7 +20,7 @@ require_once(INCLUDE_DIR.'class.attachment.php');
 if(!$thisstaff || !$_GET['id'] || !$_GET['h']
         || !($attachment=Attachment::lookup($_GET['id']))
         || !($file=$attachment->getFile()))
-    die(__('Unknown or invalid attachment'));
+    Http::response(404, __('Unknown or invalid attachment'));
 
 //Validate session access hash - we want to make sure the link is FRESH! and the user has access to the parent ticket!!
 $vhash=md5($attachment->getFileId().session_id().strtolower($file->getKey()));

scp/departments.php

@@ -42,7 +42,7 @@ if($_POST){
             if(!$_POST['ids'] || !is_array($_POST['ids']) || !count($_POST['ids'])) {
                 $errors['err'] = __('You must select at least one department');
             }elseif(in_array($cfg->getDefaultDeptId(),$_POST['ids'])) {
-                $errors['err'] = __('You can not disable/delete a default department. Remove default Dept. and try again.');
+                $errors['err'] = __('You can not disable/delete a default department. Select a new default department and try again.');
             }else{
                 $count=count($_POST['ids']);
                 switch(strtolower($_POST['a'])) {

scp/groups.php

@@ -42,7 +42,7 @@ if($_POST){
             if(!$_POST['ids'] || !is_array($_POST['ids']) || !count($_POST['ids'])) {
                 $errors['err'] = __('You must select at least one group.');
             } elseif(in_array($thisstaff->getGroupId(), $_POST['ids'])) {
-                $errors['err'] = __("As an admin, you can't disable/delete a group you belong to - you might lockout all admins!");
+                $errors['err'] = __("As an admin, you cannot disable/delete a group you belong to - you might lockout all admins!");
             } else {
                 $count=count($_POST['ids']);
                 switch(strtolower($_POST['a'])) {

scp/helptopics.php

@@ -105,10 +105,10 @@ if($_POST){
                                         $t->setSortOrder($v);
                                 }
                             }
-                            $msg = 'Successfully set sorting configuration';
+                            $msg = __('Successfully set sorting configuration');
                         }
                         catch (Exception $ex) {
-                            $errors['err'] = 'Unable to set sorting mode';
+                            $errors['err'] = __('Unable to set sorting mode');
                         }
                         break;
                     default:

scp/templates.php

@@ -103,9 +103,9 @@ if($_POST){
                         if($i && $i==$count)
                             $msg = __('Selected templates disabled');
                         elseif($i)
-                            $warn = sprintf(__('%1$d of %2$d selected templates disabled (in-use templates can\'t be disabled)'), $i, $count);
+                            $warn = sprintf(__('%1$d of %2$d selected template sets disabled (in-use templates cannot be disabled)'), $i, $count);
                         else
-                            $errors['err'] = __("Unable to disable selected templates (in-use or default template can't be disabled)");
+                            $errors['err'] = __("Unable to disable selected template sets (in-use or default template cannot be disabled)");
                         break;
                     case 'delete':
                         $i=0;

setup/cli/modules/i18n.php

@@ -148,7 +148,7 @@ class i18n_Compiler extends Module {
         list($code, $js) = $this->_http_get(
             'http://imperavi.com/webdownload/redactor/lang/?lang='
             .strtolower($lang));
-        if ($code == 200)
+        if ($code == 200 && ($js != 'File not found'))
             $phar->addFromString('js/redactor.js', $js);
         else
             $this->stderr->write("Unable to fetch Redactor language file\n");