[*] Some text labels cannot be translated - fixed

src/classes/XLite/Controller/Admin/AddonsListInstalled.php

@@ -44,7 +44,7 @@ class AddonsListInstalled extends \XLite\Controller\Admin\Base\AddonsList
      */
     public function getTitle()
     {
-        return 'Manage add-ons';
+        return static::t('Manage add-ons');
     }
 
     /**
@@ -56,7 +56,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'Manage add-ons';
+        return static::t('Manage add-ons');
     }
 
     // {{{ Short-name methods

src/classes/XLite/Controller/Admin/AddonsListMarketplace.php

@@ -49,7 +49,7 @@ class AddonsListMarketplace extends \XLite\Controller\Admin\Base\AddonsList
      */
     public function getTitle()
     {
-        return self::MARKETPLACE_TITLE;
+        return static::t(self::MARKETPLACE_TITLE);
     }
 
     /**
@@ -61,6 +61,6 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return self::MARKETPLACE_TITLE;
+        return static::t(self::MARKETPLACE_TITLE);
     }
 }

src/classes/XLite/Controller/Admin/AddressBook.php

@@ -54,7 +54,7 @@ class AddressBook extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return \XLite\Core\Request::getInstance()->widget ? 'Address details' : 'Edit profile';
+        return \XLite\Core\Request::getInstance()->widget ? static::t('Address details') : static::t('Edit profile');
     }
 
     /**
@@ -180,7 +180,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Search profiles', $this->buildURL('profile_list'));
+        $this->addLocationNode(static::t('Search profiles'), $this->buildURL('profile_list'));
     }
 
     /**

src/classes/XLite/Controller/Admin/Base/BackupRestore.php

@@ -54,7 +54,7 @@ abstract class BackupRestore extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Backup/Restore';
+        return static::t('Backup/Restore');
     }
 
     /**
@@ -136,6 +136,6 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Backup/Restore', $this->buildURL('db_backup'));
+        $this->addLocationNode(static::t('Backup/Restore'), $this->buildURL('db_backup'));
     }
 }

src/classes/XLite/Controller/Admin/BrowseServer.php

@@ -44,6 +44,6 @@ class BrowseServer extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Browse server';
+        return static::t('Browse server');
     }
 }

src/classes/XLite/Controller/Admin/Categories.php

@@ -46,7 +46,7 @@ public function getTitle()
     {
         return ($this->getCategory() && $this->getRootCategoryId() !== $this->getCategory()->getCategoryId())
             ? $this->getCategory()->getName()
-            : 'Manage categories';
+            : static::t('Manage categories');
     }
 
     /**

src/classes/XLite/Controller/Admin/Category.php

@@ -55,7 +55,7 @@ class Category extends \XLite\Controller\Admin\Base\Catalog
     public function getPages()
     {
         return array(
-            'category_modify' => ($this->getCategory()->getCategoryId()) ? 'Modify category' : 'Add new category'
+            'category_modify' => ($this->getCategory()->getCategoryId()) ? static::t('Modify category') : static::t('Add new category')
         );
     }
 

src/classes/XLite/Controller/Admin/Countries.php

@@ -44,7 +44,7 @@ class Countries extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Countries';
+        return static::t('Countries');
     }
 
     /**
@@ -70,7 +70,7 @@ public function getCountries()
      */
     protected function getLocation()
     {
-        return 'Countries';
+        return static::t('Countries');
     }
 
     /**

src/classes/XLite/Controller/Admin/DbBackup.php

@@ -102,7 +102,7 @@ protected function getPageReturnURL()
         $url = array();
 
         if ('backup' == \XLite\Core\Request::getInstance()->action) {
-            $url[] = '<a href="admin.php?target=db_backup">Return to admin interface.</a>';
+            $url[] = '<a href="admin.php?target=db_backup">'.static::t('Return to admin interface.').'</a>';
 
         } else {
             $url = parent::getPageReturnURL();

src/classes/XLite/Controller/Admin/DbRestore.php

@@ -162,7 +162,7 @@ protected function getPageReturnURL()
 
             case 'restore_from_uploaded_file':
             case 'restore_from_local_file':
-                $url[] = '<a href="admin.php?target=db_restore">Return to admin interface.</a>';
+                $url[] = '<a href="admin.php?target=db_restore">'.static::t('Return to admin interface.').'</a>';
                 break;
 
             default:

src/classes/XLite/Controller/Admin/ImportExport.php

@@ -102,8 +102,8 @@ class ImportExport extends \XLite\Controller\Admin\AAdmin
     public function getPages()
     {
         return array(
-            'import' => 'Import',
-            'export' => 'Export',
+            'import' => static::t('Import'),
+            'export' => static::t('Export'),
         );
     }
 
@@ -150,7 +150,7 @@ public function getPage()
      */
     public function getTitle()
     {
-        return 'Import / Export';
+        return static::t('Import / Export');
     }
 
     /**

src/classes/XLite/Controller/Admin/Languages.php

@@ -55,7 +55,7 @@ class Languages extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Language labels';
+        return static::t('Language labels');
     }
 
     /**
@@ -94,7 +94,7 @@ public function getReturnURL()
      */
     protected function getLocation()
     {
-        return 'Language labels';
+        return static::t('Language labels');
     }
 
     /**

src/classes/XLite/Controller/Admin/ModuleKey.php

@@ -46,7 +46,7 @@ class ModuleKey extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Enter license key';
+        return static::t('Enter license key');
     }
 
     // }}}

src/classes/XLite/Controller/Admin/Order.php

@@ -67,7 +67,7 @@ public function checkAccess()
      */
     protected function getLocation()
     {
-        return 'Order #' . \XLite\Core\Request::getInstance()->order_id;
+        return static::t('Order #') . \XLite\Core\Request::getInstance()->order_id;
     }
 
     /**
@@ -81,7 +81,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Search orders', $this->buildURL('order_list'));
+        $this->addLocationNode(static::t('Search orders'), $this->buildURL('order_list'));
     }
 
     /**
@@ -147,7 +147,7 @@ protected function getViewerTemplate()
     public function getPages()
     {
         return array(
-            'default' => 'General info',
+            'default' => static::t('General info'),
         );
     }
 

src/classes/XLite/Controller/Admin/OrderList.php

@@ -44,7 +44,7 @@ class OrderList extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Search orders';
+        return static::t('Search orders');
     }
 
     /**

src/classes/XLite/Controller/Admin/OrdersStats.php

@@ -68,12 +68,12 @@ public function getPageTemplate()
     public function getRowTitles()
     {
         return array(
-            self::P_PROCESSED  => 'Processed/Completed',
-            self::P_QUEUED     => 'Queued',
-            self::P_FAILED     => 'Failed/Declined',
-            self::P_INCOMPLETE => 'Not finished',
-            self::P_TOTAL      => 'Total',
-            self::P_PAID       => 'Paid',
+            self::P_PROCESSED  => static::t('Processed/Completed'),
+            self::P_QUEUED     => static::t('Queued'),
+            self::P_FAILED     => static::t('Failed/Declined'),
+            self::P_INCOMPLETE => static::t('Not finished'),
+            self::P_TOTAL      => static::t('Total'),
+            self::P_PAID       => static::t('Paid'),
         );
     }
 

src/classes/XLite/Controller/Admin/Product.php

@@ -55,13 +55,13 @@ class Product extends \XLite\Controller\Admin\AAdmin
     public function getPages()
     {
         $pages = array(
-            'info'  => 'Product info',
+            'info'  => static::t('Product info'),
         );
 
         if (!$this->isNew()) {
             $pages += array(
-                'images'    => 'Product images',
-                'inventory' => 'Inventory tracking',
+                'images'    => static::t('Product images'),
+                'inventory' => static::t('Inventory tracking'),
             );
         }
 
@@ -207,7 +207,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Search products', $this->buildURL('product_list'));
+        $this->addLocationNode(static::t('Search products'), $this->buildURL('product_list'));
     }
 
     /**

src/classes/XLite/Controller/Admin/ProductList.php

@@ -68,7 +68,7 @@ public function getCondition($paramName)
      */
     public function getTitle()
     {
-        return 'Search products';
+        return static::t('Search products');
     }
 
 
@@ -81,7 +81,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'Search product';
+        return static::t('Search product');
     }
 
     /**

src/classes/XLite/Controller/Admin/Profile.php

@@ -56,7 +56,7 @@ public static function getRegisterMode()
      */
     public function getTitle()
     {
-        return 'Edit profile';
+        return static::t('Edit profile');
     }
 
 
@@ -133,7 +133,7 @@ protected function addBaseLocation()
     {
         parent::addBaseLocation();
 
-        $this->addLocationNode('Users', $this->buildURL('profile_list'));
+        $this->addLocationNode(static::t('Users'), $this->buildURL('profile_list'));
     }
 
     /**

src/classes/XLite/Controller/Admin/ProfileList.php

@@ -44,7 +44,7 @@ class ProfileList extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Search users';
+        return static::t('Search users');
     }
 
     /**
@@ -56,7 +56,7 @@ public function getTitle()
      */
     protected function getLocation()
     {
-        return 'Users';
+        return static::t('Users');
     }
 
     /**

src/classes/XLite/Controller/Admin/SelectFile.php

@@ -44,7 +44,7 @@ class SelectFile extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Upload file';
+        return static::t('Upload file');
     }
 
     /**

src/classes/XLite/Controller/Admin/Settings.php

@@ -75,7 +75,7 @@ class Settings extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'General settings';
+        return static::t('General settings');
     }
 
     /**
@@ -88,12 +88,12 @@ public function getTitle()
     public function getPages()
     {
         return array(
-            'General'     => 'General',
-            'Company'     => 'Company',
-            'Email'       => 'Email',
-            'Security'    => 'Security',
-            'Environment' => 'Environment',
-            'Performance' => 'Performance',
+            'General'     => static::t('General'),
+            'Company'     => static::t('Company'),
+            'Email'       => static::t('Email'),
+            'Security'    => static::t('Security'),
+            'Environment' => static::t('Environment'),
+            'Performance' => static::t('Performance'),
         );
     }
 
@@ -139,7 +139,7 @@ public function getOptions()
      */
     protected function getLocation()
     {
-        return 'General settings';
+        return static::t('General settings');
     }
 
     /**

src/classes/XLite/Controller/Admin/ShippingMethods.php

@@ -44,7 +44,7 @@ class ShippingMethods extends \XLite\Controller\Admin\AAdmin
      */
     public function getTitle()
     {
-        return 'Shipping methods';
+        return static::t('Shipping methods');
     }
 
     /**

src/classes/XLite/Controller/Admin/ShippingRates.php

@@ -170,7 +170,7 @@ protected function doActionChange()
      */
     protected function getLocation()
     {
-        return 'Shipping rates';
+        return static::t('Shipping rates');
     }
 
     /**

src/classes/XLite/Controller/Admin/ShippingSettings.php

@@ -57,7 +57,7 @@ public function getOptions()
      */
     public function getTitle()
     {
-        return 'Shipping';
+        return static::t('Shipping');
     }
 
     /**
@@ -136,6 +136,6 @@ protected function getLocation()
      */
     protected function getOptionsCategory()
     {
-        return static::t('Shipping');
+        return 'Shipping';
     }
 }