Refactor translations (hestiacp#3441)

* Refactor translation

- Refactor translations
- Add support for Whitelabeling (Logo's will come in other PR)
- Add support for changing email templates
- Removed copy javascript email credentials to  hidden input.

* Remove multiple php errors

Fix: php error Undefined variable $error
Remove: Undefined variable $v_record_id
Remove: Undefined variable $status
Also removed unused from form: murmur hasn't been used for a long time...

* Fix error message v-change-web-docroot

* Fix label DNS records

* Improve "Refactor translations" (hestiacp#3512)

* Use sprintf instead gettext twice

Allows translators to format Every 2 days.

For month tab replace: "Date" with "Day"

* Another fixes to "Refactor translations (hestiacp#3441)" (hestiacp#3523)

* Another fixes to "Refactor translations"

* Final adjustments

* Fix syntax error

* Convert {text} to <b>text</b>

Also remove hardcode color from template in add access key

---------

Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
Co-authored-by: Alec Rust <me@alecrust.com>
Co-authored-by: myrevery <16082142+myrevery@users.noreply.github.com>

Author: 3 people

.prettierignore

@@ -23,6 +23,9 @@
 # Web templates (for now)
 web/templates/
 
+# Email templates
+/install/common/templates/email/
+
 # Vendor/packages
 .pnp.*
 .yarn/*

bin/v-change-user-language

@@ -23,15 +23,18 @@ source $HESTIA/func/main.sh
 source_conf "$HESTIA/conf/hestia.conf"
 
 is_language_valid() {
-	if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then
-		echo "Error: language $1 is not valid"
-		log_event "$E_INVALID" "$ARGUMENTS"
-		exit $E_INVALID
-	fi
-	if [ ! -d "$HESTIA/web/locale/$1" ]; then
-		echo "Error: language $1 doesn't exist"
-		log_event "$E_NOTEXIST" "$ARGUMENTS"
-		exit $E_NOTEXIST
+	# English is always allowed
+	if [ "$1" != "en" ]; then
+		if ! [[ "$1" =~ ^[[:alnum:]_-]+$ ]]; then
+			echo "Error: language $1 is not valid"
+			log_event "$E_INVALID" "$ARGUMENTS"
+			exit $E_INVALID
+		fi
+		if [ ! -d "$HESTIA/web/locale/$1" ]; then
+			echo "Error: language $1 doesn't exist"
+			log_event "$E_NOTEXIST" "$ARGUMENTS"
+			exit $E_NOTEXIST
+		fi
 	fi
 }
 

bin/v-change-web-domain-docroot

@@ -89,7 +89,7 @@ else
 		# Checking destination path
 		real_target_directory="$(readlink -e "${target_domain_directory}/public_html/$target_directory/")"
 		if [ ! -e "$real_target_directory" ]; then
-			check_result "$E_NOTEXIST" "Directory $target_directory does not exist under $HOMEDIR/$user/$target_domain/public_html/."
+			check_result "$E_NOTEXIST" "Directory $target_directory does not exist under $HOMEDIR/$user/web/$target_domain/public_html/."
 		elif [ -z "$(echo $real_target_directory | egrep "^$target_domain_directory\b")" ]; then
 			check_result "$E_FORBIDEN" "Target dir outside of target domain dir"
 		else

bin/v-list-sys-config

@@ -103,7 +103,13 @@ json_list() {
         "SERVER_SMTP_USER": "'$SERVER_SMTP_USER'",
         "SERVER_SMTP_PASSWD": "'$SERVER_SMTP_PASSWD'",
         "SERVER_SMTP_ADDR": "'$SERVER_SMTP_ADDR'",
-		"DISABLE_IP_CHECK": "'$DISABLE_IP_CHECK'"
+		"DISABLE_IP_CHECK": "'$DISABLE_IP_CHECK'",
+		"FROM_NAME": "'$FROM_NAME'",
+		"FROM_EMAIL": "'$FROM_EMAIL'",
+		"APP_NAME": "'$APP_NAME'",
+		"TITLE": "'$TITLE'",
+		"SUBJECT_EMAIL": "'$SUBJECT_EMAIL'",
+		"HIDE_DOCS": "'$HIDE_DOCS'"
     }
     }'
 }

bin/v-list-sys-hestia-updates

@@ -107,7 +107,7 @@ if [ -n "$hesta_v" ] && [ "$hestia_v" \> "$VERSION" ]; then
 fi
 
 data="NAME='hestia' VERSION='$VERSION' ARCH='$ARCH'"
-data="$data UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'"
+data="$data UPDATED='$UPDATED' DESCR='Hestia core package' TIME='$TIME' DATE='$DATE'"
 
 # Checking installed hestia-php version
 if [ -f '/etc/redhat-release' ]; then
@@ -122,7 +122,7 @@ if [ -n "$php_v" ] && [ "$php_v" \> "$VERSION" ]; then
 fi
 
 data="$data\nNAME='hestia-php' VERSION='$VERSION'"
-data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='php interpreter'"
+data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='Hestia internal php interpreter'"
 data="$data TIME='$TIME' DATE='$DATE'"
 
 # Checking installed hestia-nginx version
@@ -138,7 +138,7 @@ if [ -n "$nginx_v" ] && [ "$nginx_v" \> "$VERSION" ]; then
 fi
 
 data="$data\nNAME='hestia-nginx' VERSION='$VERSION'"
-data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='internal web server'"
+data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='Hestia internal web server'"
 data="$data TIME='$TIME' DATE='$DATE'"
 
 # Listing data

bin/v-list-sys-languages

@@ -27,6 +27,7 @@ json_list() {
 	objects=$(echo "$languages" | wc -l)
 	i=1
 	echo '['
+	echo -e "\t\"en\","
 	for lang in $languages; do
 		if [ "$i" -lt "$objects" ]; then
 			echo -e "\t\"$lang\","
@@ -42,13 +43,15 @@ json_list() {
 shell_list() {
 	echo "LANGUAGE"
 	echo "--------"
+	echo "en"
 	for lang in $languages; do
 		echo "$lang"
 	done
 }
 
 # PLAIN list function
 plain_list() {
+	echo "en"
 	for lang in $languages; do
 		echo "$lang"
 	done
@@ -57,6 +60,7 @@ plain_list() {
 # CSV list function
 csv_list() {
 	echo "LANGUAGE"
+	echo "en"
 	for lang in $languages; do
 		echo "$lang"
 	done

bin/v-list-sys-services

@@ -200,7 +200,7 @@ fi
 # Checking MAIL IMAP
 if [ -n "$IMAP_SYSTEM" ] && [ "$IMAP_SYSTEM" != 'remote' ]; then
 	get_srv_state "$IMAP_SYSTEM"
-	data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='pop/imap server' STATE='$state'"
+	data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='imap / pop server' STATE='$state'"
 	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
 fi
 
@@ -217,15 +217,15 @@ if [ -n "$ANTIVIRUS_SYSTEM" ] && [ "$ANTIVIRUS_SYSTEM" != 'remote' ]; then
 		fi
 		get_srv_state "$ANTIVIRUS_SYSTEM" "$proc_name"
 	fi
-	data="$data\nNAME='$ANTIVIRUS_SYSTEM' SYSTEM='email antivirus'"
+	data="$data\nNAME='$ANTIVIRUS_SYSTEM' SYSTEM='email anti-virus'"
 	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'"
 	proc_name=''
 fi
 
 # Checking MAIL ANTISPAM
 if [ -n "$ANTISPAM_SYSTEM" ] && [ "$ANTISPAM_SYSTEM" != 'remote' ]; then
 	get_srv_state "$ANTISPAM_SYSTEM" "spamd"
-	data="$data\nNAME='$ANTISPAM_SYSTEM' SYSTEM='email antispam'"
+	data="$data\nNAME='$ANTISPAM_SYSTEM' SYSTEM='email spam filter'"
 	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'"
 fi
 
@@ -295,7 +295,7 @@ fi
 # Checking SSH daemon
 if [ -e "/etc/ssh/sshd_config" ]; then
 	get_srv_state ssh
-	data="$data\nNAME='ssh' SYSTEM='SSH Access' STATE='$state'"
+	data="$data\nNAME='ssh' SYSTEM='ssh server' STATE='$state'"
 	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
 fi
 
@@ -320,7 +320,7 @@ if [ -n "$FIREWALL_EXTENSION" ]; then
 	else
 		get_srv_state "$FIREWALL_EXTENSION" fail2ban-server script
 	fi
-	data="$data\nNAME='$FIREWALL_EXTENSION' SYSTEM='brute-force monitor'"
+	data="$data\nNAME='$FIREWALL_EXTENSION' SYSTEM='brute-force protection'"
 	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'"
 fi
 

docs/docs/server-administration/backup-restore.md

@@ -69,7 +69,7 @@ Currently supported backup protocols are:
 Login via SSH and run the following command as root:
 
 ```bash
-v-add-backup-host 'ftp' 'remote.ftp-host.ltd' 'backup-user' 'p4ssw0rd' '/path-backups/' 'port'
+v-add-backup-host 'ftp' 'remote.ftp-host.tld' 'backup-user' 'p4ssw0rd' '/path-backups/' 'port'
 ```
 
 ### How to setup an SFTP backup server
@@ -81,13 +81,13 @@ Please note passwords are stored as **plain text** on the server. They are only
 Login via SSH and run the following command as root:
 
 ```bash
-v-add-backup-host 'sftp' 'remote.ftp-host.ltd' 'backup-user' 'p4ssw0rd' '/path-backups/' 'port'
+v-add-backup-host 'sftp' 'remote.ftp-host.tld' 'backup-user' 'p4ssw0rd' '/path-backups/' 'port'
 ```
 
 If using public and private keys (recommended):
 
 ```bash
-v-add-backup-host 'sftp' 'remote.ftp-host.ltd' 'backup-user' '/root/id_rsa' '/path-backups/' 'port'
+v-add-backup-host 'sftp' 'remote.ftp-host.tld' 'backup-user' '/root/id_rsa' '/path-backups/' 'port'
 ```
 
 ## How to setup Rclone

func/main.sh

@@ -1580,7 +1580,7 @@ source_conf() {
 format_no_quotes() {
 	exclude="['|\"]"
 	if [[ "$1" =~ $exclude ]]; then
-		check_result "$E_INVALID" "Invalid $2 contains qoutes (\" or ') :: $1"
+		check_result "$E_INVALID" "Invalid $2 contains qoutes (\" or ' or | ) :: $1"
 	fi
 	is_no_new_line_format "$1"
 }

func/syshealth.sh

@@ -483,6 +483,34 @@ function syshealth_repair_system_config() {
 		echo "[ ! ] Adding missing variable to hestia.conf: DISABLE_IP_CHECK ('no')"
 		$BIN/v-change-sys-config-value "DISABLE_IP_CHECK" "no"
 	fi
+	if [[ -z $(check_key_exists 'APP_NAME') ]]; then
+		echo "[ ! ] Adding missing variable to hestia.conf: APP_NAME ('Hestia Control Panel')"
+		$BIN/v-change-sys-config-value "APP_NAME" "Hestia Control Panel"
+	fi
+	if [[ -z $(check_key_exists 'FROM_NAME') ]]; then
+		# Default is always APP_NAME
+		echo "[ ! ] Adding missing variable to hestia.conf: FROM_NAME ('')"
+		$BIN/v-change-sys-config-value "FROM_NAME" ""
+	fi
+	if [[ -z $(check_key_exists 'FROM_EMAIL') ]]; then
+		# Default is always noreply@hostname.com
+		echo "[ ! ] Adding missing variable to hestia.conf: FROM_EMAIL ('')"
+		$BIN/v-change-sys-config-value "FROM_EMAIL" ""
+	fi
+	if [[ -z $(check_key_exists 'SUBJECT_EMAIL') ]]; then
+		echo "[ ! ] Adding missing variable to hestia.conf: SUBJECT_EMAIL ('{{subject}}')"
+		$BIN/v-change-sys-config-value "SUBJECT_EMAIL" "{{subject}}"
+	fi
+
+	if [[ -z $(check_key_exists 'TITLE') ]]; then
+		echo "[ ! ] Adding missing variable to hestia.conf: TITLE ('{{page}} - {{hostname}} - {{appname}}')"
+		$BIN/v-change-sys-config-value "TITLE" "{{page}} - {{hostname}} - {{appname}}"
+	fi
+
+	if [[ -z $(check_key_exists 'HIDE_DOCS') ]]; then
+		echo "[ ! ] Adding missing variable to hestia.conf: HIDE_DOCS ('no')"
+		$BIN/v-change-sys-config-value "HIDE_DOCS" "no"
+	fi
 
 	touch $HESTIA/conf/hestia.conf.new
 	while IFS='= ' read -r lhs rhs; do