[gentoo-commits] proj/eselect:master commit in: /, modules/

[Ulrich Müller]

commit:     7aaf43b23a0b9bc0bb4a2e726bda344409233176
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 10:10:55 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 10:10:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=7aaf43b2

Suppress C and POSIX as languages in news module; support _<territory>.

* modules/news.eselect (accepted_languages): Suppress "C"
and "POSIX" in output. Support <language>_<territory>.

---
 ChangeLog            |  5 +++++
 modules/news.eselect | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c7a8cd..6aad604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Ulrich Müller  <ulm@g.o>
+
+	* modules/news.eselect (accepted_languages): Suppress "C"
+	and "POSIX" in output. Support <language>_<territory>.
+
 2014-02-18  Ulrich Müller  <ulm@g.o>
 
 	* man/news.eselect.5: Update URI of GLEP 42.

diff --git a/modules/news.eselect b/modules/news.eselect
index 463cbbc..782f81c 100644
--- a/modules/news.eselect
+++ b/modules/news.eselect
@@ -87,9 +87,14 @@ find_repo_dir() {
 
 # return list of accepted languages
 accepted_languages() {
-	local lc=${LC_ALL:-${LANG}}
-	lc=${lc%%[^[:alpha:]]*}
-	[[ -n ${lc} && ${lc} != en ]] && echo ${lc}
+	local lc lct=${LC_ALL:-${LANG}}
+	lct=${lct%%[^[:alpha:]_]*}	# strip .* @* etc.
+	lc=${lct%%_*}				# strip _<territory>
+	[[ ${lct} != "${lc}" ]] && echo "${lct}"
+	case ${lc} in
+		""|C|POSIX|en) ;;
+		*) echo "${lc}" ;;
+	esac
 	echo en
 }