Commits

Zhang Huangbin committed 6d1ccd5

Remove dialog page: choosing default language.

Comments (0)

Files changed (4)

iRedMail/dialog/default_language.sh

-#!/usr/bin/env bash
-
-# Author:   Zhang Huangbin <zhb(at)iredmail.org>
-
-#---------------------------------------------------------------------
-# This file is part of iRedMail, which is an open source mail server
-# solution for Red Hat(R) Enterprise Linux, CentOS, Debian and Ubuntu.
-#
-# iRedMail is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# iRedMail is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with iRedMail.  If not, see <http://www.gnu.org/licenses/>.
-#---------------------------------------------------------------------
-
-# Set default language for webmails.
-
-${DIALOG} \
-    --title "Choose the default language for your webmail(s)" \
-    --radiolist "\
-Choose the default language for your webmail(s):
-
-TIP:
-    * Use 'Space' key to select item.
-
-" 20 76 8 \
-  'en_US' 'English (US)' 'on' \
-  'zh_CN' 'Chinese (Simplified)' 'off' \
-  'zh_TW' 'Chinese (Traditional)' 'off' \
-  'sq_AL' 'Albanian' 'off' \
-  'ar_SA' 'Arabic' 'off' \
-  'hy_AM' 'Armenian' 'off' \
-  'az_AZ' 'Azerbaijani' 'off' \
-  'bs_BA' 'Bosnian (Serbian Latin)' 'off' \
-  'bg_BG' 'Bulgarian' 'off' \
-  'ca_ES' 'Català' 'off' \
-  'cy_GB' 'Cymraeg' 'off' \
-  'hr_HR' 'Croatian (Hrvatski)' 'off' \
-  'cs_CZ' 'Czech' 'off' \
-  'da_DK' 'Dansk' 'off' \
-  'de_DE' 'Deutsch (Deutsch)' 'off' \
-  'de_CH' 'Deutsch (Schweiz)' 'off' \
-  'en_GB' 'English (GB)' 'off' \
-  'es_ES' 'Español' 'off' \
-  'eo'    'Esperanto' 'off' \
-  'et_EE' 'Estonian' 'off' \
-  'eu_ES' 'Euskara (Basque)' 'off' \
-  'fi_FI' 'Finnish (Suomi)' 'off' \
-  'nl_BE' 'Flemish' 'off' \
-  'fr_FR' 'Français' 'off' \
-  'gl_ES' 'Galego (Galician)' 'off' \
-  'ka_GE' 'Georgian (Kartuli)' 'off' \
-  'el_GR' 'Greek' 'off' \
-  'he_IL' 'Hebrew' 'off' \
-  'hi_IN' 'Hindi' 'off' \
-  'hu_HU' 'Hungarian' 'off' \
-  'is_IS' 'Icelandic' 'off' \
-  'id_ID' 'Indonesian' 'off' \
-  'ga_IE' 'Irish' 'off' \
-  'it_IT' 'Italiano' 'off' \
-  'ja_JP' 'Japanese (日本語)' 'off' \
-  'ko_KR' 'Korean' 'off' \
-  'ku'    'Kurdish (Kurmancî)' 'off' \
-  'lv_LV' 'Latvian' 'off' \
-  'lt_LT' 'Lithuanian' 'off' \
-  'mk_MK' 'Macedonian' 'off' \
-  'ms_MY' 'Malay' 'off' \
-  'nl_NL' 'Nederlands' 'off' \
-  'ne_NP' 'Nepali' 'off' \
-  'nb_NO' 'Norsk (Bokmål)' 'off' \
-  'nn_NO' 'Norsk (Nynorsk)' 'off' \
-  'fa'    'Persian (Farsi)' 'off' \
-  'pl_PL' 'Polski' 'off' \
-  'pt_BR' 'Portuguese (Brazilian)' 'off' \
-  'pt_PT' 'Portuguese (Standard)' 'off' \
-  'ro_RO' 'Romanian' 'off' \
-  'ru_RU' 'Русский' 'off' \
-  'sr_CS' 'Serbian (Cyrillic)' 'off' \
-  'si_LK' 'Sinhala' 'off' \
-  'sk_SK' 'Slovak' 'off' \
-  'sl_SI' 'Slovenian' 'off' \
-  'sv_SE' 'Swedish (Svenska)' 'off' \
-  'th_TH' 'Thai' 'off' \
-  'tr_TR' 'Türkçe' 'off' \
-  'uk_UA' 'Ukrainian' 'off' \
-  'vi_VN' 'Vietnamese' 'off' \
-   2>/tmp/language
-
-DEFAULT_LANG="$(cat /tmp/language)"
-export DEFAULT_LANG="${DEFAULT_LANG}" && echo "export DEFAULT_LANG='${DEFAULT_LANG}'" >> ${CONFIG_FILE}
-rm -f /tmp/language

iRedMail/dialog/optional_components.sh

     echo "export USE_FAIL2BAN='YES'" >>${CONFIG_FILE}
 fi
 
-# ----------------------------------------------------------------
-# Promot to choose the prefer language for webmail.
-[ X"${USE_WEBMAIL}" == X"YES" ] && . ${DIALOG_DIR}/default_language.sh
-
 # Used when you use awstats.
 [ X"${USE_AWSTATS}" == X"YES" ] && . ${DIALOG_DIR}/awstats_config.sh

iRedMail/functions/postfix.sh

     postconf -e smtp_data_init_timeout='240s'
     postconf -e smtp_data_xfer_timeout='600s'
 
-    #
-    # Standalone smtpd_helo_restrictions.
-    #
+    # HELO restriction
     postconf -e smtpd_helo_required="yes"
     postconf -e smtpd_helo_restrictions="permit_mynetworks,permit_sasl_authenticated, check_helo_access pcre:${POSTFIX_FILE_HELO_ACCESS}"
 

iRedMail/functions/roundcubemail.sh

     # ----------------------------------
     # USER INTERFACE
     # ----------------------------------
-    # Set default language and charset..
-    perl -pi -e 's#(.*language.*= )(.*)#${1}"$ENV{'DEFAULT_LANG'}";#' main.inc.php
-
     # Automatic create and protect default IMAP folders.
     perl -pi -e 's#(.*create_default_folders.*=)(.*)#${1} true;#' main.inc.php
     perl -pi -e 's#(.*protect_default_folders.*=)(.*)#${1} true;#' main.inc.php
     # USER PREFERENCES
     # ----------------------------------
     perl -pi -e 's#(.*default_charset.*=).*#${1} "UTF-8";#' main.inc.php
-
-    # Set timezone for Chinese users. UTC +8
-    [ X"${DEFAULT_LANG}" == X"zh_CN" -o X"${DEFAULT_LANG}" == X"zh_TW" ] && \
-        perl -pi -e 's#(.*timezone.*=).*#${1} 8;#' main.inc.php
+    perl -pi -e 's#(.*addressbook_sort_col.*=).*#${1} "name";#' main.inc.php
 
     # display remote inline images
     # 0 - Never, always ask