Commit 7efb0b5e authored by Tails developers's avatar Tails developers

Gettext-ize the two new scripts brought by feature/dont_autostart_iceweasel.

parent 3f6aa667
......@@ -10,6 +10,11 @@ if [ $2 != "up" ]; then
exit 0
fi
#XXX gettextize
/usr/local/sbin/tails-notify-user "Tor is now ready" \
"Tor is ready. You can now use the Internet."
# Initialize gettext support
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
/usr/local/sbin/tails-notify-user \
"`gettext \"Tor is now ready\"`" \
"`gettext \"Tor is ready. You can now use the Internet.\"`"
#!/bin/sh
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
# Import tor_bootstrap_progress()
. /usr/local/lib/tails-shell-library/tor.sh
# Import LIVE_USERNAME
. /etc/live/config.d/username.conf
ask_for_confirmation() {
#XXX gettextize
zenity --question --title="Launch iceweasel before Tor is ready?" \
--text="Tor is not ready yet. You will not be able to browse the Internet. Start the browser anyway?"
local dialog_title="`gettext \"Tor is not ready\"`"
local dialog_text="`gettext \"Tor is not ready. Start Tor Browser anyway?\"`"
local dialog_start="`gettext \"Start Tor Browser\"`"
local dialog_cancel="`gettext \"Cancel\"`"
# zenity can't set the default button to cancel, so we switch the
# labels and interpret the return value as its negation.
! sudo -u "$LIVE_USERNAME" zenity --question \
--title "$dialog_title" --text="$dialog_text" \
--cancel-label "$dialog_start" --ok-label "$dialog_cancel"
}
if [ $(tor_bootstrap_progress) -eq 100 ] || ask_for_confirmation; then
......
# Files updated without intltool-update
tmp/pot/60-tor-ready-notification.sh.pot
tmp/pot/config.py.pot
tmp/pot/gpgApplet.pot
tmp/pot/iceweasel.pot
tmp/pot/shutdown_helper_applet.pot
tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot
......
......@@ -8,7 +8,9 @@ PERL_PROGS="/usr/local/bin/gpgApplet /usr/local/bin/tails-security-check \
/usr/local/bin/tails-virt-notify-user"
PYTHON_PROGS="/etc/whisperback/config.py /usr/local/bin/shutdown_helper_applet \
/usr/local/bin/tails-about /usr/local/sbin/tails-additional-software"
SHELL_PROGS="/usr/local/bin/tails-update-frontend-wrapper \
SHELL_PROGS="/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh \
/usr/local/bin/iceweasel \
/usr/local/bin/tails-update-frontend-wrapper \
/usr/local/sbin/unsafe-browser /usr/share/tails/truecrypt-wrapper.disabled"
LOCALE_BASEDIR=config/chroot_local-includes/usr/share/locale
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment