Merge branch '4987-redir-labels' into 'develop'

Resolve "user-friendly labels for "Redirect Type""

Closes #5808 and #4987

See merge request ispconfig/ispconfig3!1245

Author: Marius Burkard

interface/web/sites/form/web_childdomain.tform.php

@@ -119,7 +119,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => 'y',
-			'value'  => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
+			'value'  => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'r_redirect_txt', 'L' => 'l_redirect_txt', 'R,L' => 'r_l_redirect_txt', 'R=301,L' => 'r_301_l_redirect_txt', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
 		),
 		'redirect_path' => array (
 			'datatype' => 'VARCHAR',

interface/web/sites/form/web_vhost_domain.tform.php

@@ -397,7 +397,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => '',
-			'value'  => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L', 'R=301,L' => 'R=301,L', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
+			'value'  => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'r_redirect_txt', 'L' => 'l_redirect_txt', 'R,L' => 'r_l_redirect_txt', 'R=301,L' => 'r_301_l_redirect_txt', 'last' => 'last', 'break' => 'break', 'redirect' => 'redirect', 'permanent' => 'permanent', 'proxy' => 'proxy')
 		),
 		'redirect_path' => array (
 			'datatype' => 'VARCHAR',

interface/web/sites/lib/lang/ar_web_aliasdomain.lng

@@ -18,6 +18,10 @@ $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a s
 $wb['type_txt'] = 'Type';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
 $wb['document_root_txt'] = 'Documentroot';

interface/web/sites/lib/lang/ar_web_childdomain.lng

@@ -13,6 +13,10 @@ $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Type';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
 $wb['document_root_txt'] = 'Documentroot';

interface/web/sites/lib/lang/ar_web_domain.lng

@@ -14,6 +14,10 @@ $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Type';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
 $wb['document_root_txt'] = 'Documentroot';

interface/web/sites/lib/lang/ar_web_subdomain.lng

@@ -13,6 +13,10 @@ $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Type';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
 $wb['document_root_txt'] = 'Documentroot';

interface/web/sites/lib/lang/ar_web_vhost_domain.lng

@@ -14,6 +14,10 @@ $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Type';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
 $wb['document_root_txt'] = 'Document Root';

interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng

@@ -22,6 +22,10 @@ $wb['host_txt'] = 'Hostname';
 $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
 $wb['type_txt'] = 'Type';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
 $wb['document_root_txt'] = 'Documentroot';

interface/web/sites/lib/lang/bg_web_aliasdomain.lng

@@ -18,6 +18,10 @@ $wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a s
 $wb['type_txt'] = 'Type';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
 $wb['document_root_txt'] = 'Documentroot';

interface/web/sites/lib/lang/bg_web_childdomain.lng

@@ -13,6 +13,10 @@ $wb['domain_txt'] = 'Домейн';
 $wb['type_txt'] = 'Тип';
 $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
+$wb['r_redirect_txt'] = 'R (Temporary redirect)';
+$wb['l_redirect_txt'] = 'L (Last redirect rule)';
+$wb['r_l_redirect_txt'] = 'R,L (Temporary redirect + last rule)';
+$wb['r_301_l_redirect_txt'] = 'R=301,L (Permanent redirect + last rule)';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Активен';
 $wb['document_root_txt'] = 'Documentroot';