Makefile

@@ -78,6 +78,7 @@ SYSCONFFILES = \
 	X11/Xsession.d/06debian-edu-firefox-ltsp \
 	X11/Xsession.d/09debian-edu-missing-home \
 	X11/Xsession.d/10debian-edu-one-login-per-host \
+	X11/Xsession.d/55lightdm_gtk-greeter-rc \
 	debian-edu/nightkill.conf \
 	debian-edu/pxeinstall.conf \
 	default/munin-node \
@@ -341,6 +342,7 @@ install: install-testsuite
 		share/debian-edu-config/tools/edu-ldap-from-scratch \
 		share/debian-edu-config/tools/create-user-nssdb \
 		share/debian-edu-config/tools/copy-host-keytab \
+		share/debian-edu-config/tools/improve-desktop-l10n \
 		share/debian-edu-config/ltspfs-mounter-kde \
 		share/debian-edu-config/squid.resolvconf \
 		share/ltsp/get-ldap-ltsp-config \
@@ -388,6 +390,7 @@ install: install-testsuite
 		share/debian-edu-config/udisks2.patch \
 		share/debian-edu-config/edu-xfce4-panel.xml \
 		share/debian-edu-config/55xfce4-session-debian-edu \
+		share/debian-edu-config/lightdm-gtk-greeter.conf \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \

cf3/cf.finalize

@@ -4,6 +4,16 @@ bundle agent finalize
 # Moved from other bundles to this last one in the sequence to get the right
 # execution order.
 
+files:
+
+  # Add the language chooser to the lightdm-greeter panel.
+
+  debian.lightdm.installation::
+
+    "/usr/share/lightdm/lightdm-gtk-greeter.conf.d/02debian-edu.conf"
+    link_from => ln_s("/usr/share/debian-edu-config/lightdm-gtk-greeter.conf"),
+    move_obstructions => "true";
+
 commands:
 
   debian.server.installation::
@@ -17,6 +27,14 @@ commands:
     "/usr/sbin/exim4 -qff"
       contain => in_shell;
 
+  # Enable localization for desktop applications like The GIMP and Thunderbird.
+  # Also, the language/country related debian-edu-doc package is installed.
+
+  debian.(desktopintern|standalone).installation::
+
+    "/usr/share/debian-edu-config/tools/improve-desktop-l10n"
+      contain => in_shell;
+
   # Update /etc/environment and APT configuration using wpad.dat file.
   # Do it late to make sure scripts like debian-edu-pxeinstall do not get
   # the wrong proxy setting when installing a main-server and the webcache

cf3/edu.cf

@@ -39,4 +39,6 @@ bundle common edu
     "xfce"           expression => isdir("/etc/xdg/xfce4");
     # Set if lxqt is installed; used to conditionally configure settings.
     "lxqt"           expression => isdir("/usr/share/pcmanfm-qt/lxqt");
+   # Set if lightdm-gtk-greeter is installed; used to conditionally configure the panel.
+    "lightdm"        expression => isdir("/usr/share/lightdm/lightdm-gtk-greeter.conf.d/");
 }

debian/changelog

+debian-edu-config (2.10.51) UNRELEASED; urgency=medium
+
+  * Add components for a more flexible and improved desktop localization.
+    - share/debian-edu-config/lightdm-gtk-greeter.conf:
+      + Enable language chooser in the lightdm panel.
+    - etc/X11/Xsession.d/55lightdm_gtk-greeter-rc:
+      + Create environment variables, needed to let the chosen language take
+        effect everywhere.
+    - share/debian-edu-config/tools/improve-desktop-l10n:
+      + Evaluate configured locales and install related localization packages.
+  * Add class definition to cf3/edu.cf to be able to conditionally configure
+    the lightdm-gtk-greeter.
+  * Adjust Makefile and cf3/finalize to reflect the changes.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Tue, 18 Dec 2018 12:26:15 +0100
+
 debian-edu-config (2.10.50) unstable; urgency=medium
 
   [ Mike Gabriel ]

etc/X11/Xsession.d/55lightdm_gtk-greeter-rc

+# Fix environment / locale variables in case language chooser is enabled in the lightdm panel.
+
+if [ -L /usr/share/lightdm/lightdm-gtk-greeter.conf.d/02debian-edu.conf ] && \
+    [ -e /run/lightdm.pid ] && [ -f $HOME/.dmrc ]; then
+    if cat $HOME/.dmrc | grep Language ; then
+	export LANGUAGE="$(cat $HOME/.dmrc | grep Language | cut -d'=' -f2 | sed -e 's/utf8/UTF-8/')"
+	DEFAULT_LOCALE="$(locale | head -1 | cut -d'=' -f2)"
+	export LC_CTYPE=$LANGUAGE
+	export LC_NUMERIC=$DEFAULT_LOCALE
+	export LC_TIME=$DEFAULT_LOCALE
+	export LC_COLLATE=$DEFAULT_LOCALE
+	export LC_MONETARY=$DEFAULT_LOCALE
+	export LC_MESSAGES=$LANGUAGE
+	export LC_PAPER=$DEFAULT_LOCALE
+	export LC_NAME=$DEFAULT_LOCALE
+	export LC_ADDRESS=$DEFAULT_LOCALE
+	export LC_TELEPHONE=$DEFAULT_LOCALE
+	export LC_MEASUREMENT=$DEFAULT_LOCALE
+	export LC_IDENTIFICATION=$LANGUAGE
+    fi
+fi
+#

share/debian-edu-config/lightdm-gtk-greeter.conf

+# Debian Edu specific defaults
+# (add language chooser)
+
+[greeter]
+indicators = ~host;~spacer;~clock;~language;~session;~a11y;~power

share/debian-edu-config/tools/improve-desktop-l10n

+#!/bin/sh
+
+# firefox-esr, libreoffice and KDE are already localized; do it for some more
+# packages that are installed by default (all supported desktop environments).
+#
+# schweer, 2018-12-15.
+
+set -e
+langsfull="$(locale -a|grep utf8|cut -d'.' -f1)"
+for lang in $(echo $langsfull) ; do
+    baselang="${lang%_*}"
+    langcountry="$(echo ${lang%.*}|cut -d'_' -f2 | tr '[:upper:]' '[:lower:]')"
+    for i in debian-edu-doc gimp-help thunderbird-l10n; do
+        if ! [ -z "$(apt-cache search $i-$baselang-$langcountry)" ]; then
+            apt-get -yq install $i-$baselang-$langcountry
+        else
+            if ! [ -z "$(apt-cache search $i-$baselang)" ]; then
+                apt-get -y install $i-$baselang
+        fi
+        fi
+    done
+    # special cases nn_NO and nb_NO (debian-edu-doc and gimp-help).
+    if [ "nn" = "$baselang" ] && [ "no" = "$langcountry" ] && \
+        ! [ -z "$(apt-cache search debian-edu-doc-nb)" ] ; then
+            apt-get -yq install debian-edu-doc-nb
+    fi
+    if [ "nb" = "$baselang" ] && [ "no" = "$langcountry" ] && \
+        ! [ -z "$(apt-cache search gimp-help-nn)" ] ; then
+            apt-get -yq install gimp-help-nn
+    fi
+done
\ No newline at end of file