diff --git a/app/music_on_hold/app_languages.php b/app/music_on_hold/app_languages.php
index 628c09232c..d7f305537a 100644
--- a/app/music_on_hold/app_languages.php
+++ b/app/music_on_hold/app_languages.php
@@ -141,26 +141,6 @@ $text['message-upload_completed']['ru-ru'] = "Загрузка завершен
$text['message-upload_completed']['sv-se'] = "Ladda Avslutat";
$text['message-upload_completed']['uk-ua'] = "Завантажено";
-$text['message-unsupported_file_type']['en-us'] = "Unsupported File Type";
-$text['message-unsupported_file_type']['ar-eg'] = "";
-$text['message-unsupported_file_type']['de-at'] = "Dateityp nicht unterstützt"; //copied from de-de
-$text['message-unsupported_file_type']['de-ch'] = "Dateityp nicht unterstützt"; //copied from de-de
-$text['message-unsupported_file_type']['de-de'] = "Dateityp nicht unterstützt";
-$text['message-unsupported_file_type']['es-cl'] = "Tipo de archivo no compatible";
-$text['message-unsupported_file_type']['es-mx'] = "Tipo de archivo no compatible"; //copied from es-cl
-$text['message-unsupported_file_type']['fr-ca'] = "Type de fichier non pris en charge"; //copied from fr-fr
-$text['message-unsupported_file_type']['fr-fr'] = "Type de fichier non pris en charge";
-$text['message-unsupported_file_type']['he-il'] = "סוג הקובץ לא נתמך";
-$text['message-unsupported_file_type']['it-it'] = "Tipo File non Supportato";
-$text['message-unsupported_file_type']['nl-nl'] = "Niet ondersteund bestandstype";
-$text['message-unsupported_file_type']['pl-pl'] = "Nieobsługiwany typ pliku";
-$text['message-unsupported_file_type']['pt-br'] = "Não suportado Tipo de Arquivo"; //copied from pt-pt
-$text['message-unsupported_file_type']['pt-pt'] = "Não suportado Tipo de Arquivo";
-$text['message-unsupported_file_type']['ro-ro'] = "";
-$text['message-unsupported_file_type']['ru-ru'] = "Тип файла не поддерживается";
-$text['message-unsupported_file_type']['sv-se'] = "Inte stöds filtyp";
-$text['message-unsupported_file_type']['uk-ua'] = "Тип файлу не підтримується";
-
$text['message-nofiles']['en-us'] = "No files found.";
$text['message-nofiles']['ar-eg'] = "";
$text['message-nofiles']['de-at'] = "Es wurden keine Dateien gefunden."; //copied from de-de
@@ -241,26 +221,6 @@ $text['message-click-select']['ru-ru'] = "Дважды щелкните, что
$text['message-click-select']['sv-se'] = "Dubbelklicka för att välja en existerande kategori.";
$text['message-click-select']['uk-ua'] = "Двічі клацніть, щоб вибрати існуючу категорію";
-$text['label-uploaded']['en-us'] = "Uploaded";
-$text['label-uploaded']['ar-eg'] = "";
-$text['label-uploaded']['de-at'] = "Hochgeladen"; //copied from de-de
-$text['label-uploaded']['de-ch'] = "Hochgeladen"; //copied from de-de
-$text['label-uploaded']['de-de'] = "Hochgeladen";
-$text['label-uploaded']['es-cl'] = "Subir";
-$text['label-uploaded']['es-mx'] = "Subir"; //copied from es-cl
-$text['label-uploaded']['fr-ca'] = "Envoyé"; //copied from fr-fr
-$text['label-uploaded']['fr-fr'] = "Envoyé";
-$text['label-uploaded']['he-il'] = "הוטען";
-$text['label-uploaded']['it-it'] = "Caricato";
-$text['label-uploaded']['nl-nl'] = "Opgestuurd";
-$text['label-uploaded']['pl-pl'] = "Przesłano";
-$text['label-uploaded']['pt-br'] = "Carregado"; //copied from pt-pt
-$text['label-uploaded']['pt-pt'] = "Carregado";
-$text['label-uploaded']['ro-ro'] = "";
-$text['label-uploaded']['ru-ru'] = "Загружено";
-$text['label-uploaded']['sv-se'] = "Uppladdad";
-$text['label-uploaded']['uk-ua'] = "Завантажено";
-
$text['label-upload-music_on_hold']['en-us'] = "Upload Music";
$text['label-upload-music_on_hold']['ar-eg'] = "";
$text['label-upload-music_on_hold']['de-at'] = "Musik hochladen"; //copied from de-de
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index b38f1cb566..34b748e0dd 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -2280,46 +2280,6 @@ $text['label-custom_cdr_fields']['ru-ru'] = "Custom";
$text['label-custom_cdr_fields']['sv-se'] = "Custom";
$text['label-custom_cdr_fields']['uk-ua'] = "Custom";
-$text['label-ascending']['en-us'] = "Ascending";
-$text['label-ascending']['ar-eg'] = "Ascending";
-$text['label-ascending']['de-at'] = "Ascending";
-$text['label-ascending']['de-ch'] = "Ascending";
-$text['label-ascending']['de-de'] = "Ascending";
-$text['label-ascending']['es-cl'] = "Ascending";
-$text['label-ascending']['es-mx'] = "Ascending";
-$text['label-ascending']['fr-ca'] = "Ascending";
-$text['label-ascending']['fr-fr'] = "Ascending";
-$text['label-ascending']['he-il'] = "Ascending";
-$text['label-ascending']['it-it'] = "Ascending";
-$text['label-ascending']['nl-nl'] = "Ascending";
-$text['label-ascending']['pl-pl'] = "Ascending";
-$text['label-ascending']['pt-br'] = "Ascending";
-$text['label-ascending']['pt-pt'] = "Ascending";
-$text['label-ascending']['ro-ro'] = "Ascending";
-$text['label-ascending']['ru-ru'] = "Ascending";
-$text['label-ascending']['sv-se'] = "Ascending";
-$text['label-ascending']['uk-ua'] = "Ascending";
-
-$text['label-descending']['en-us'] = "Descending";
-$text['label-descending']['ar-eg'] = "Descending";
-$text['label-descending']['de-at'] = "Descending";
-$text['label-descending']['de-ch'] = "Descending";
-$text['label-descending']['de-de'] = "Descending";
-$text['label-descending']['es-cl'] = "Descending";
-$text['label-descending']['es-mx'] = "Descending";
-$text['label-descending']['fr-ca'] = "Descending";
-$text['label-descending']['fr-fr'] = "Descending";
-$text['label-descending']['he-il'] = "Descending";
-$text['label-descending']['it-it'] = "Descending";
-$text['label-descending']['nl-nl'] = "Descending";
-$text['label-descending']['pl-pl'] = "Descending";
-$text['label-descending']['pt-br'] = "Descending";
-$text['label-descending']['pt-pt'] = "Descending";
-$text['label-descending']['ro-ro'] = "Descending";
-$text['label-descending']['ru-ru'] = "Descending";
-$text['label-descending']['sv-se'] = "Descending";
-$text['label-descending']['uk-ua'] = "Descending";
-
$text['label-minimum']['en-us'] = "Minimum";
$text['label-minimum']['ar-eg'] = "Minimum";
$text['label-minimum']['de-at'] = "Minimum";
diff --git a/resources/app_languages.php b/resources/app_languages.php
index c40eb3890e..3120698fb8 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -329,6 +329,26 @@ $text['message-duplicate']['sv-se'] = "Dubblett Upptäckt";
$text['message-duplicate']['uk-ua'] = "Знайдено дублікат";
$text['message-duplicate']['tr-tr'] = "Kopya Algılandı";
+$text['message-unsupported_file_type']['en-us'] = "Unsupported File Type";
+$text['message-unsupported_file_type']['ar-eg'] = "";
+$text['message-unsupported_file_type']['de-at'] = "Dateityp nicht unterstützt"; //copied from de-de
+$text['message-unsupported_file_type']['de-ch'] = "Dateityp nicht unterstützt"; //copied from de-de
+$text['message-unsupported_file_type']['de-de'] = "Dateityp nicht unterstützt";
+$text['message-unsupported_file_type']['es-cl'] = "Tipo de archivo no compatible";
+$text['message-unsupported_file_type']['es-mx'] = "Tipo de archivo no compatible"; //copied from es-cl
+$text['message-unsupported_file_type']['fr-ca'] = "Type de fichier non pris en charge"; //copied from fr-fr
+$text['message-unsupported_file_type']['fr-fr'] = "Type de fichier non pris en charge";
+$text['message-unsupported_file_type']['he-il'] = "סוג הקובץ לא נתמך";
+$text['message-unsupported_file_type']['it-it'] = "Tipo File non Supportato";
+$text['message-unsupported_file_type']['nl-nl'] = "Niet ondersteund bestands type";
+$text['message-unsupported_file_type']['pl-pl'] = "Nieobsługiwany typ pliku";
+$text['message-unsupported_file_type']['pt-br'] = "Não suportado Tipo de Arquivo"; //copied from pt-pt
+$text['message-unsupported_file_type']['pt-pt'] = "Não suportado Tipo de Arquivo";
+$text['message-unsupported_file_type']['ro-ro'] = "";
+$text['message-unsupported_file_type']['ru-ru'] = "Тип файла не поддерживается";
+$text['message-unsupported_file_type']['sv-se'] = "Inte stöds filtyp";
+$text['message-unsupported_file_type']['uk-ua'] = "Тип файлу не підтримується";
+
$text['confirm-delete']['en-us'] = "Do you really want to delete this?";
$text['confirm-delete']['ar-eg'] = "هل تريد حقا أن تحذف هذا؟";
$text['confirm-delete']['de-at'] = "Wollen Sie das wirklich löschen?"; //copied from de-de
@@ -3619,6 +3639,66 @@ $text['label-page']['ru-ru'] = "Page";
$text['label-page']['sv-se'] = "Page";
$text['label-page']['uk-ua'] = "";
+$text['label-ascending']['en-us'] = "Ascending";
+$text['label-ascending']['ar-eg'] = "Ascending";
+$text['label-ascending']['de-at'] = "Ascending";
+$text['label-ascending']['de-ch'] = "Ascending";
+$text['label-ascending']['de-de'] = "Ascending";
+$text['label-ascending']['es-cl'] = "Ascending";
+$text['label-ascending']['es-mx'] = "Ascending";
+$text['label-ascending']['fr-ca'] = "Ascending";
+$text['label-ascending']['fr-fr'] = "Ascending";
+$text['label-ascending']['he-il'] = "Ascending";
+$text['label-ascending']['it-it'] = "Ascending";
+$text['label-ascending']['nl-nl'] = "Ascending";
+$text['label-ascending']['pl-pl'] = "Ascending";
+$text['label-ascending']['pt-br'] = "Ascending";
+$text['label-ascending']['pt-pt'] = "Ascending";
+$text['label-ascending']['ro-ro'] = "Ascending";
+$text['label-ascending']['ru-ru'] = "Ascending";
+$text['label-ascending']['sv-se'] = "Ascending";
+$text['label-ascending']['uk-ua'] = "Ascending";
+
+$text['label-descending']['en-us'] = "Descending";
+$text['label-descending']['ar-eg'] = "Descending";
+$text['label-descending']['de-at'] = "Descending";
+$text['label-descending']['de-ch'] = "Descending";
+$text['label-descending']['de-de'] = "Descending";
+$text['label-descending']['es-cl'] = "Descending";
+$text['label-descending']['es-mx'] = "Descending";
+$text['label-descending']['fr-ca'] = "Descending";
+$text['label-descending']['fr-fr'] = "Descending";
+$text['label-descending']['he-il'] = "Descending";
+$text['label-descending']['it-it'] = "Descending";
+$text['label-descending']['nl-nl'] = "Descending";
+$text['label-descending']['pl-pl'] = "Descending";
+$text['label-descending']['pt-br'] = "Descending";
+$text['label-descending']['pt-pt'] = "Descending";
+$text['label-descending']['ro-ro'] = "Descending";
+$text['label-descending']['ru-ru'] = "Descending";
+$text['label-descending']['sv-se'] = "Descending";
+$text['label-descending']['uk-ua'] = "Descending";
+
+$text['label-uploaded']['en-us'] = "Uploaded";
+$text['label-uploaded']['ar-eg'] = "";
+$text['label-uploaded']['de-at'] = "Hochgeladen"; //copied from de-de
+$text['label-uploaded']['de-ch'] = "Hochgeladen"; //copied from de-de
+$text['label-uploaded']['de-de'] = "Hochgeladen";
+$text['label-uploaded']['es-cl'] = "Subir";
+$text['label-uploaded']['es-mx'] = "Subir"; //copied from es-cl
+$text['label-uploaded']['fr-ca'] = "Envoyé"; //copied from fr-fr
+$text['label-uploaded']['fr-fr'] = "Envoyé";
+$text['label-uploaded']['he-il'] = "הוטען";
+$text['label-uploaded']['it-it'] = "Caricato";
+$text['label-uploaded']['nl-nl'] = "Opgestuurd";
+$text['label-uploaded']['pl-pl'] = "Przesłano";
+$text['label-uploaded']['pt-br'] = "Carregado"; //copied from pt-pt
+$text['label-uploaded']['pt-pt'] = "Carregado";
+$text['label-uploaded']['ro-ro'] = "";
+$text['label-uploaded']['ru-ru'] = "Загружено";
+$text['label-uploaded']['sv-se'] = "Uppladdad";
+$text['label-uploaded']['uk-ua'] = "Завантажено";
+
$text['button-tickets']['en-us'] = "Tickets";
$text['button-tickets']['ar-eg'] = "";
$text['button-tickets']['de-at'] = ""; //copied from de-de
diff --git a/resources/functions.php b/resources/functions.php
index 511f4bbd4a..5a33083099 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -375,6 +375,7 @@
if (!function_exists('th_order_by')) {
//html table header order by
function th_order_by($field_name, $column_title, $order_by, $order, $app_uuid = '', $css = '', $http_get_params = '', $description = '') {
+ global $text;
if (is_uuid($app_uuid) > 0) { $app_uuid = "&app_uuid=".$app_uuid; } // accomodate need to pass app_uuid where necessary (inbound/outbound routes lists)
$field_name = preg_replace("#[^a-zA-Z0-9_]#", "", $field_name);
@@ -419,12 +420,12 @@
$order = 'asc';
}
if ($order == "asc") {
- $description .= 'sort(ascending)';
- $html .= "".escape($column_title)."";
+ $description .= $text['label-order'].': '.$text['label-ascending'];
+ $html .= "".escape($column_title)."";
}
else {
- $description .= 'sort(descending)';
- $html .= "".escape($column_title)."";
+ $description .= $text['label-order'].': '.$text['label-descending'];
+ $html .= "".escape($column_title)."";
}
$html .= "";
return $html;