Page Title translation capabilities. Switched to the ampersand html e…

…ntity I'm saying capabilities because there are too many pages and I can't add all the translation terms to the domain files at this moment. Some are going to be picked up because they already exist in the domain files, though. I had to enter the ampersand html entity name in order for it to be displayed correctly. It's taking into consideration the space before and after that I found in almost all of the page titles class properties.
inoerp · ReactorShop · Oct 31, 2016 · Oct 31, 2016 · Nov 1, 2016 · Nov 1, 2016
commit 00b0aeec8a58eadcdd6735a4568a7aacdf6e11f8
diff --git a/inoerp/extensions/comment/class.comment.inc b/inoerp/extensions/comment/class.comment.inc
@@ -84,7 +84,7 @@ class comment extends dbObject {
   'comment_user_name',
   'subscribe_cb'
  ];
- public $pageTitle = " Comment - Create & View different Comments ";
+ public $pageTitle = " Comment - Create &amp; View Different Comments ";
  public $search = [
   '_view_path' => 'form.php?class_name=',
   '_show_view_path' => 1,
@@ -501,4 +501,4 @@ class comment extends dbObject {
 }
 
 //end of comment class
-?>
+?>
diff --git a/inoerp/extensions/comment/class_extn_comment.inc b/inoerp/extensions/comment/class_extn_comment.inc
@@ -84,7 +84,7 @@ class extn_comment extends dbObject {
   'comment_user_name',
   'subscribe_cb'
  ];
- public $pageTitle = " Comment - Create & View different Comments ";
+ public $pageTitle = " Comment - Create &amp; View Different Comments ";
  public $search = [
   '_view_path' => 'form.php?class_name=',
   '_show_view_path' => 1,
@@ -515,4 +515,4 @@ class extn_comment extends dbObject {
 }
 
 //end of comment class
-?>
+?>
diff --git a/inoerp/extensions/convertToProd/class_extn_convertToProd.inc b/inoerp/extensions/convertToProd/class_extn_convertToProd.inc
@@ -508,7 +508,7 @@ class extn_convertToProd extends dbObject {
   'pm_process_operation_detail',
   'pm_formula_byproduct',
  ];
- public $pageTitle = " Conver to Production "; //page Title
+ public $pageTitle = " Convert to Production "; //page Title
  public $convertToProd_id;
  public $message;
  public $convert_to_prod_mode;
@@ -619,4 +619,4 @@ AND table_type = 'BASE TABLE'
 }
 
 //end of path class
-?>
+?>
diff --git a/inoerp/extensions/demo_user/activity/class_user_activity_v.inc b/inoerp/extensions/demo_user/activity/class_user_activity_v.inc
@@ -47,7 +47,7 @@ class user_activity_v extends dbObject {
  public $initial_search = [
   'item_number',
  ];
- public $pageTitle = " Forecast activity "; //page Title
+ public $pageTitle = " Forecast Activity "; //page Title
  public $search_functions = [
   'Organization' => 'search_org_name',
   'Forecast ' => 'search_forecast_name',

diff --git a/inoerp/extensions/demo_user/dashboard/class_user_dashboard_v.inc b/inoerp/extensions/demo_user/dashboard/class_user_dashboard_v.inc
@@ -47,7 +47,7 @@ class user_dashboard_v extends dbObject {
  public $initial_search = [
   'item_number',
  ];
- public $pageTitle = " Forecast dashboard "; //page Title
+ public $pageTitle = " Forecast Dashboard "; //page Title
  public $search_functions = [
   'Organization' => 'search_org_name',
   'Forecast ' => 'search_forecast_name',

diff --git a/inoerp/extensions/demo_user/reset_password.php b/inoerp/extensions/demo_user/reset_password.php
@@ -1,6 +1,6 @@
 <?php
 
-$pageTitle = " User - Create & Update all Users ";
+$pageTitle = " User - Create &amp; Update all Users ";
 $view_path = "user_view";
 ?>
 <?php include_once('../../includes/basics/header_public.inc'); ?>

diff --git a/inoerp/extensions/ino_user/activity/class_user_activity_v.inc b/inoerp/extensions/ino_user/activity/class_user_activity_v.inc
@@ -45,7 +45,7 @@ class user_activity_v extends dbObject {
   'content_type',
  ];
 
- public $pageTitle = " User activity "; //page Title
+ public $pageTitle = " User Activity "; //page Title
 
  public $content_id;
  public $content_type_id;

diff --git a/inoerp/extensions/ino_user/reset_password.php b/inoerp/extensions/ino_user/reset_password.php
@@ -1,5 +1,5 @@
 <?php
-$pageTitle = " User - Create & Update all Users ";
+$pageTitle = " User - Create &amp; Update all Users ";
 $view_path = "user_view";
 require_once __DIR__.'/../../includes/basics/basics.inc';
 ?>
@@ -61,4 +61,4 @@
  if (!empty($message)) {
   echo '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>' . $message;
  }
- ?></div>
+ ?></div>
diff --git a/inoerp/extensions/page/class_page.inc b/inoerp/extensions/page/class_page.inc
@@ -73,7 +73,7 @@ class page extends dbObject {
  ];
  public $requiredField = ["content"
  ];
- public $pageTitle = " Content - Create & View different contents ";
+ public $pageTitle = " Content - Create &amp; View Different Contents ";
  public $search = [
 		  '_show_update_path' => 1,
 		 '_update_action_meassge' => 'Update',

diff --git a/inoerp/extensions/page/view/class_page_view.inc b/inoerp/extensions/page/view/class_page_view.inc
@@ -51,7 +51,7 @@ class page_view extends dbObject {
  ];
  public $requiredField = ["content"
  ];
- public $pageTitle = " Content - Create & View different contents ";
+ public $pageTitle = " Content - Create &amp; View Different Contents ";
  public $search = [
 		 '_show_update_path' => 1,
 		 '_update_action_meassge' => 'Update',

diff --git a/inoerp/extensions/user/activity/class_user_activity_v.inc b/inoerp/extensions/user/activity/class_user_activity_v.inc
@@ -45,7 +45,7 @@ class user_activity_v extends dbObject {
   'content_type',
  ];
 
- public $pageTitle = " User activity "; //page Title
+ public $pageTitle = " User Activity "; //page Title
 
  public $content_id;
  public $content_type_id;

diff --git a/inoerp/extensions/user/reset_password.php b/inoerp/extensions/user/reset_password.php
@@ -1,5 +1,5 @@
 <?php
-$pageTitle = " User - Create & Update all Users ";
+$pageTitle = " User - Create &amp; Update all Users ";
 $view_path = "user_view";
 require_once __DIR__.'/../../includes/basics/basics.inc';
 ?>

diff --git a/inoerp/extensions/view/old_view/view_path/view_path.php b/inoerp/extensions/view/old_view/view_path/view_path.php
@@ -2,7 +2,7 @@
 $extension = 'view_path';
 $key_field = 'column_name';
 $primary_column = "view_path_id";
-$pageTitle = " View - Create & update view path ";
+$pageTitle = " View - Create &amp; Update View Path ";
 $required_field_flag = 1;
 ?>
 <?php include_once("../../../include/basics/header.inc"); ?>

diff --git a/inoerp/extensions/view/old_view/view_path/view_paths.php b/inoerp/extensions/view/old_view/view_path/view_paths.php
@@ -9,7 +9,7 @@
  $sql = $_GET['sql'];
 }
 
-$viewTitle = " View - Create & update $view_type_name ";
+$viewTitle = " " . gettext('View') . " - " . gettext('Create &amp; Update') . ' ' . gettext(trim($view_type_name)) . " ";
 $extension = "view";
 $key_field = "view";
 $primary_column = "view_id";

diff --git a/inoerp/extensions/view/test.php b/inoerp/extensions/view/test.php
@@ -2,7 +2,7 @@
 $extension = 'view';
 $key_field = 'view';
 $primary_column = "view_id";
-$pageTitle = " View - Create & update view ";
+$pageTitle = " View - Create &amp; Update View ";
 $required_field_flag = 1;
 include_once("../../include/basics/header.inc");
 

diff --git a/inoerp/extensions/view/view_path/view_path.php b/inoerp/extensions/view/view_path/view_path.php
@@ -2,7 +2,7 @@
 $extension = 'view_path';
 $key_field = 'column_name';
 $primary_column = "view_path_id";
-$pageTitle = " View - Create & update view path ";
+$pageTitle = " View - Create &amp; Update View Path ";
 $required_field_flag = 1;
 ?>
 <?php include_once("../../../include/basics/header.inc"); ?>

diff --git a/inoerp/extensions/view/view_path/view_paths.php b/inoerp/extensions/view/view_path/view_paths.php
@@ -9,7 +9,7 @@
  $sql = $_GET['sql'];
 }
 
-$viewTitle = " View - Create & update $view_type_name ";
+$viewTitle = " " . gettext('View') . " - " . gettext('Create &amp; Update') . ' ' . gettext(trim($view_type_name)) . " ";
 $extension = "view";
 $key_field = "view";
 $primary_column = "view_id";

diff --git a/inoerp/includes/basics/header.inc b/inoerp/includes/basics/header.inc
@@ -13,7 +13,7 @@ if (!empty($dont_check_login)) {
 	<meta name="robots" content="noindex">
 	<meta name="description" content="inoERP - A Open Source PHP/C++ based Enterprise Management System">
 	<meta name="keywords" content="ERP,PHP ERP,Open Source ERP ">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo THEME_URL; 
 	echo (!empty($content_class))? '/content_layout.css' : '/layout.css' ?>" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo THEME_URL; ?>/public.css" media="all" rel="stylesheet" type="text/css" />

diff --git a/inoerp/includes/basics/header_find.inc b/inoerp/includes/basics/header_find.inc
@@ -6,7 +6,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+        <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
         <link href="<?php echo HOME_URL; ?>themes/layout.css" media="all" rel="stylesheet" type="text/css" />
         <link href="<?php echo HOME_URL; ?>themes/public.css" media="all" rel="stylesheet" type="text/css" />
         <link href="<?php echo HOME_URL; ?>themes/menu.css" media="all" rel="stylesheet" type="text/css" />
@@ -20,4 +20,4 @@
     <body>
    <div id="main_find">
 
-  <? ob_flush(); ?>
+  <? ob_flush(); ?>
diff --git a/inoerp/includes/basics/header_public.inc b/inoerp/includes/basics/header_public.inc
@@ -10,7 +10,7 @@ check_browser(); ?>
   }
   ?>
   <meta name="keywords" content="ERP,PHP ERP,Open Source ERP ">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo HOME_URL; ?>/themes/default/public.css" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo HOME_URL; ?>/themes/default/menu.css" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo HOME_URL; ?>/themes/default/jquery.css" media="all" rel="stylesheet" type="text/css" />

diff --git a/inoerp/includes/basics/header_simple.inc b/inoerp/includes/basics/header_simple.inc
@@ -7,7 +7,7 @@
 <html>
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo HOME_URL; ?>themes/print.css" media="all" rel="stylesheet" type="text/css" />
  </head>
  <body>
@@ -17,4 +17,4 @@
 	 die("You dont have access to this page! :  ");
 	}
 	?>
-	<? ob_flush(); ?>
+	<? ob_flush(); ?>
diff --git a/inoerp/includes/basics/search_page.inc b/inoerp/includes/basics/search_page.inc
@@ -8,7 +8,7 @@
   }
   ?>
   <meta name="keywords" content="ERP,PHP ERP,Open Source ERP ">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo THEME_URL; ?>/public.css" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo THEME_URL; ?>/menu.css" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo THEME_URL; ?>/jquery.css" media="all" rel="stylesheet" type="text/css" />

diff --git a/inoerp/includes/basics/select_page.inc b/inoerp/includes/basics/select_page.inc
@@ -8,7 +8,7 @@
   }
   ?>
   <meta name="keywords" content="ERP,PHP ERP,Open Source ERP ">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php
 //  echo THEME_URL;
 //  echo (!empty($content_class)) ? '/content_layout.css' : '/layout.css'

diff --git a/inoerp/includes/basics/xxxheader.inc b/inoerp/includes/basics/xxxheader.inc
@@ -13,7 +13,7 @@ if (!empty($dont_check_login)) {
 	<meta name="robots" content="noindex">
 	<meta name="description" content="inoERP - A Open Source PHP/C++ based Enterprise Management System">
 	<meta name="keywords" content="ERP,PHP ERP,Open Source ERP ">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo THEME_URL; 
 	echo (!empty($content_class))? '/content_layout.css' : '/layout.css' ?>" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo THEME_URL; ?>/public.css" media="all" rel="stylesheet" type="text/css" />

diff --git a/inoerp/includes/basics/xxxheader_find.inc b/inoerp/includes/basics/xxxheader_find.inc
@@ -6,7 +6,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+        <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
         <link href="<?php echo HOME_URL; ?>themes/layout.css" media="all" rel="stylesheet" type="text/css" />
         <link href="<?php echo HOME_URL; ?>themes/public.css" media="all" rel="stylesheet" type="text/css" />
         <link href="<?php echo HOME_URL; ?>themes/menu.css" media="all" rel="stylesheet" type="text/css" />
@@ -20,4 +20,4 @@
     <body>
    <div id="main_find">
 
-  <? ob_flush(); ?>
+  <? ob_flush(); ?>
diff --git a/inoerp/includes/basics/xxxheader_simple.inc b/inoerp/includes/basics/xxxheader_simple.inc
@@ -7,7 +7,7 @@
 <html>
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo HOME_URL; ?>themes/print.css" media="all" rel="stylesheet" type="text/css" />
  </head>
  <body>
@@ -17,4 +17,4 @@
 	 die("You dont have access to this page! :  ");
 	}
 	?>
-	<? ob_flush(); ?>
+	<? ob_flush(); ?>
diff --git a/inoerp/includes/functions/loader.inc b/inoerp/includes/functions/loader.inc
@@ -563,9 +563,9 @@ if ($readonly) {
 
 
 if (($class == 'content') && (!empty($content->subject))) {
- $pageTitle = $content->subject;
+ $pageTitle = ' ' . gettext(trim($content->subject)) . ' ';
 } else if (is_object($$class)) {
- $pageTitle = property_exists($$class, 'pageTitle') ? $$class->pageTitle : 'inoERP';
+ $pageTitle = property_exists($$class, 'pageTitle') ? ' ' . gettext(trim($$class->pageTitle)) . ' ' : 'inoERP';
 }
 
 

diff --git a/inoerp/includes/general_class/class_inoform.inc b/inoerp/includes/general_class/class_inoform.inc
@@ -208,7 +208,7 @@ class inoform {
   'user_group_access',
   'wip_accounting_group'
  ];
- public $pageTitle = " inoFrom - All Forms "; //page Title
+ public $pageTitle = " inoForm - All Forms "; //page Title
  public $option_lists = [
 //		 'supplier_type' => 'SUPPLIER_TYPE',
  ];

diff --git a/inoerp/includes/template/header_public.inc b/inoerp/includes/template/header_public.inc
@@ -10,7 +10,7 @@ check_browser(); ?>
   }
   ?>
   <meta name="keywords" content="ERP,PHP ERP,Open Source ERP ">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo HOME_URL; ?>/themes/default/public.css" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo HOME_URL; ?>/themes/default/menu.css" media="all" rel="stylesheet" type="text/css" />
   <link href="<?php echo HOME_URL; ?>/themes/default/jquery.css" media="all" rel="stylesheet" type="text/css" />

diff --git a/inoerp/includes/template/header_simple.inc b/inoerp/includes/template/header_simple.inc
@@ -7,7 +7,7 @@
 <html>
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><?php echo isset($pageTitle) ? $pageTitle . ' - inoERP!' : ' inoERP! ' ?></title>
+  <title><?php echo isset($pageTitle) ? ' ' . gettext(trim($pageTitle)) . ' ' . ' - inoERP!' : ' inoERP! ' ?></title>
   <link href="<?php echo HOME_URL; ?>themes/print.css" media="all" rel="stylesheet" type="text/css" />
  </head>
  <body>
@@ -17,4 +17,4 @@
 	 die("You dont have access to this page! :  ");
 	}
 	?>
-	<? ob_flush(); ?>
+	<? ob_flush(); ?>
diff --git a/inoerp/includes/template/json_form_template.inc b/inoerp/includes/template/json_form_template.inc
@@ -26,7 +26,7 @@
   $pageTitle = $$class->pageTitle;
 
   if (!empty($pageTitle)) {
-   echo "<div id='page_title' >$pageTitle</div>";
+   echo "<div id='page_title' >" . ' ' . gettext(trim($pageTitle)) . ' ' . "</div>";
   } else {
    echo "<div id='page_title' ></div>";
   }
@@ -96,4 +96,4 @@
   echo '</div>';
  }
  ?>
-</div>
+</div>
diff --git a/inoerp/locale/ar_SA/LC_MESSAGES/messages.mo b/inoerp/locale/ar_SA/LC_MESSAGES/messages.mo
diff --git a/inoerp/locale/ar_SA/LC_MESSAGES/messages.po b/inoerp/locale/ar_SA/LC_MESSAGES/messages.po
@@ -15739,4 +15739,22 @@ msgid "System Generated"
 msgstr "System Generated"
 
 msgid "New Entry"
-msgstr "New Entry"
+msgstr "New Entry"
+
+msgid "Create New Record"
+msgstr "Create New Record"
+
+msgid "Search To Select"
+msgstr "Search To Select"
+
+msgid "Requisition - Purchasing"
+msgstr "Requisition - Purchasing"
+
+msgid "Select value of"
+msgstr "Select value of"
+
+msgid "Specifications"
+msgstr "Specifications"
+
+msgid "Option - Create &amp; Update Different Options and Values"
+msgstr "Option - Create &amp; Update Different Options and Values"
diff --git a/inoerp/locale/de_DE/LC_MESSAGES/messages.mo b/inoerp/locale/de_DE/LC_MESSAGES/messages.mo
diff --git a/inoerp/locale/de_DE/LC_MESSAGES/messages.po b/inoerp/locale/de_DE/LC_MESSAGES/messages.po
@@ -15737,4 +15737,22 @@ msgid "System Generated"
 msgstr "System Generated"
 
 msgid "New Entry"
-msgstr "New Entry"
+msgstr "New Entry"
+
+msgid "Create New Record"
+msgstr "Create New Record"
+
+msgid "Search To Select"
+msgstr "Search To Select"
+
+msgid "Requisition - Purchasing"
+msgstr "Requisition - Purchasing"
+
+msgid "Select value of"
+msgstr "Select value of"
+
+msgid "Specifications"
+msgstr "Specifications"
+
+msgid "Option - Create &amp; Update Different Options and Values"
+msgstr "Option - Create &amp; Update Different Options and Values"
diff --git a/inoerp/locale/docs/English_Spanish.xlsx b/inoerp/locale/docs/English_Spanish.xlsx
diff --git a/inoerp/locale/en_US/LC_MESSAGES/messages.mo b/inoerp/locale/en_US/LC_MESSAGES/messages.mo