1.1 --- a/imipweb/profile.py Tue Apr 19 20:57:33 2016 +0200
1.2 +++ b/imipweb/profile.py Tue Apr 19 21:09:34 2016 +0200
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 A Web interface to the user profile.
1.6
1.7 -Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2015, 2016 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -135,7 +135,7 @@
1.13 page.table(class_="profile", cellspacing=5, cellpadding=5)
1.14 page.thead()
1.15 page.tr()
1.16 - page.th("Preferences", class_="mainheading", colspan=2)
1.17 + page.th(_("Preferences"), class_="mainheading", colspan=2)
1.18 page.tr.close()
1.19 page.thead.close()
1.20 page.tbody()
2.1 --- a/messages/en_GB.imip-agent.po Tue Apr 19 20:57:33 2016 +0200
2.2 +++ b/messages/en_GB.imip-agent.po Tue Apr 19 21:09:34 2016 +0200
2.3 @@ -7,7 +7,7 @@
2.4 msgstr ""
2.5 "Project-Id-Version: 4bc73eb1e076+\n"
2.6 "Report-Msgid-Bugs-To: \n"
2.7 -"POT-Creation-Date: 2016-04-18 21:06+0200\n"
2.8 +"POT-Creation-Date: 2016-04-18 21:21+0200\n"
2.9 "PO-Revision-Date: 2016-04-18 21:02+0200\n"
2.10 "Last-Translator: Paul Boddie <paul@boddie.org.uk>\n"
2.11 "Language-Team: English\n"
2.12 @@ -484,6 +484,10 @@
2.13 msgid "Recognise whom as a new organiser of an event?"
2.14 msgstr ""
2.15
2.16 +#: imipweb/profile.py:138
2.17 +msgid "Preferences"
2.18 +msgstr ""
2.19 +
2.20 #: imipweb/profile.py:182
2.21 msgid "Save"
2.22 msgstr ""
3.1 --- a/messages/nb_NO.imip-agent.po Tue Apr 19 20:57:33 2016 +0200
3.2 +++ b/messages/nb_NO.imip-agent.po Tue Apr 19 21:09:34 2016 +0200
3.3 @@ -7,7 +7,7 @@
3.4 msgstr ""
3.5 "Project-Id-Version: bfa410ae3d63+\n"
3.6 "Report-Msgid-Bugs-To: \n"
3.7 -"POT-Creation-Date: 2016-04-18 21:06+0200\n"
3.8 +"POT-Creation-Date: 2016-04-18 21:21+0200\n"
3.9 "PO-Revision-Date: 2016-04-08 21:21+0200\n"
3.10 "Last-Translator: Paul Boddie <paul@boddie.org.uk>\n"
3.11 "Language-Team: Norwegian Bokmål\n"
3.12 @@ -491,6 +491,10 @@
3.13 msgid "Recognise whom as a new organiser of an event?"
3.14 msgstr "Hvem får bli ny arrangør for en hendelse?"
3.15
3.16 +#: imipweb/profile.py:138
3.17 +msgid "Preferences"
3.18 +msgstr "Innstillinger"
3.19 +
3.20 #: imipweb/profile.py:182
3.21 msgid "Save"
3.22 msgstr "Lagre"
4.1 --- a/tools/install.sh Tue Apr 19 20:57:33 2016 +0200
4.2 +++ b/tools/install.sh Tue Apr 19 21:09:34 2016 +0200
4.3 @@ -61,39 +61,39 @@
4.4 fi
4.5
4.6 # Install the config module in a more appropriate location.
4.7 +# Create new versions of configuration files instead of overwriting.
4.8
4.9 if [ ! -e "$CONFIG_DIR" ]; then
4.10 mkdir -p "$CONFIG_DIR"
4.11 fi
4.12
4.13 if [ -e "$CONFIG_DIR/config.py" ]; then
4.14 - if [ ! -e "$CONFIG_DIR/config.py.backup" ]; then
4.15 - mv "$CONFIG_DIR/config.py" "$CONFIG_DIR/config.py.backup"
4.16 - fi
4.17 + mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py.new"
4.18 +else
4.19 + mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py"
4.20 fi
4.21
4.22 if [ -e "$CONFIG_DIR/config.sh" ]; then
4.23 - if [ ! -e "$CONFIG_DIR/config.sh.backup" ]; then
4.24 - mv "$CONFIG_DIR/config.sh" "$CONFIG_DIR/config.sh.backup"
4.25 - fi
4.26 + cp "tools/config.sh" "$CONFIG_DIR/config.sh.new"
4.27 +else
4.28 + cp "tools/config.sh" "$CONFIG_DIR/config.sh"
4.29 fi
4.30
4.31 # Replace the config module with a symbolic link.
4.32
4.33 -mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/"
4.34 ln -s "$CONFIG_DIR/config.py" "$INSTALL_DIR/imiptools/config.py"
4.35
4.36 -# Copy the config script.
4.37 -
4.38 -cp tools/config.sh "$CONFIG_DIR/"
4.39 -
4.40 # Copy related configuration files.
4.41
4.42 if [ ! -e "$CONFIG_DIR/postgresql" ]; then
4.43 mkdir -p "$CONFIG_DIR/postgresql"
4.44 fi
4.45
4.46 -cp conf/postgresql/schema.sql "$CONFIG_DIR/postgresql/"
4.47 +if [ -e "$CONFIG_DIR/postgresql/schema.sql" ]; then
4.48 + cp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql.new"
4.49 +else
4.50 + cp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql"
4.51 +fi
4.52
4.53 # Tools
4.54