From 0b635e50daeed04ef5ae372dcad62f344fa96bc5 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 23 Jan 2024 22:03:43 +0000 Subject: [PATCH] Translation: Drop deprecated language links (#1643) Support for full-name languages has been deprecated since Squid-3.1 it is long overdue to remove these symlinks and simplify the default install footprint. --- doc/release-notes/release-7.sgml.in | 21 +++++++++++++++ errors/Makefile.am | 6 +---- errors/alias-upgrade | 40 ----------------------------- 3 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 errors/alias-upgrade diff --git a/doc/release-notes/release-7.sgml.in b/doc/release-notes/release-7.sgml.in index 30b24de2072..927118c6305 100644 --- a/doc/release-notes/release-7.sgml.in +++ b/doc/release-notes/release-7.sgml.in @@ -32,6 +32,7 @@ The Squid-@SQUID_RELEASE@ change history can be Alternatively the HTCP CLR mechanism can be used. +Removed deprecated languages +

Old Squid used full language name to refer to error page translations. + These have been deprecated since addition of ISO-639 language codes + and support for HTTP Accept-Language negotiation in Squid-3.x. + +

As of this release Squid will no longer provide the symlinks + needed for seamless upgrade for squid.conf containing settings such as + + error_directory English + + All Squid installations are expected to already have them, + or to convert to the ISO-639 equivalents. Existing symlinks are not + affected. + +

See for the latest + list of official Squid translations. + +

See for + the full ISO-639 list. HTTP uses the 2-letter (set 1) codes. + Changes to squid.conf since Squid-@SQUID_RELEASE_OLD@

diff --git a/errors/Makefile.am b/errors/Makefile.am index 38b41230301..843104c7410 100644 --- a/errors/Makefile.am +++ b/errors/Makefile.am @@ -28,7 +28,7 @@ EXTRA_DIST = \ templates/error-details.txt \ language.am \ template.am \ - aliases alias-link.sh alias-upgrade errorpage.css TRANSLATORS COPYRIGHT + aliases alias-link.sh errorpage.css TRANSLATORS COPYRIGHT if ENABLE_TRANSLATION ALIAS_LINKER=$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" @@ -126,10 +126,6 @@ uninstall-local: rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT -## Upgrade requires the new files to be pre-installed -upgrade: install - $(ALIAS_LINKER) "$(srcdir)/alias-upgrade" || exit 1 ; - dist-hook: translate for lang in $(TRANSLATE_LANGUAGES); do \ lang=`basename $$lang .lang`; \ diff --git a/errors/alias-upgrade b/errors/alias-upgrade deleted file mode 100644 index 553e3c38699..00000000000 --- a/errors/alias-upgrade +++ /dev/null @@ -1,40 +0,0 @@ -## Copyright (C) 1996-2023 The Squid Software Foundation and contributors -## -## Squid software is distributed under GPLv2+ license and includes -## contributions from numerous individuals and organizations. -## Please see the COPYING and CONTRIBUTORS files for details. -## - -# 3.0 Still published with the old language namings. -# we leave these alone in case any are configured... -az Azerbaijani -bg Bulgarian -ca Catalan -cs Czech -da Danish -de German -el Greek -en English -es Spanish -et Estonian -fi Finnish -fr French -he Hebrew -hu Hungarian -hy Armenian -it Italian -ja Japanese -ko Korean -lt Lithuanian -nl Dutch -pl Polish -pt Portuguese -ro Romanian -ru Russian-1251 Russian-koi8-r -sk Slovak -sr-latn Serbian -sv Swedish -tr Turkish -uk Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8 -zh-cn Simplify_Chinese -zh-tw Traditional_Chinese