From 2ec0b7a910bd1a7080f79fecd110138b8da8979a Mon Sep 17 00:00:00 2001 From: tonio Date: Tue, 13 Jul 2010 17:14:53 +0200 Subject: [PATCH] fix: end of renaming. --- INSTALL | 40 ++++++++++++++-------------- README | 6 ++--- extensions/postfix_autoreply/main.py | 2 +- extensions/webmail/views.py | 2 +- lib/events.py | 2 +- lib/parameters.py | 2 +- locale/de/LC_MESSAGES/django.po | 21 +++++++-------- locale/de/LC_MESSAGES/djangojs.po | 2 +- locale/fr/LC_MESSAGES/django.po | 21 +++++++-------- locale/fr/LC_MESSAGES/djangojs.po | 2 +- settings_sample.py | 2 +- templates/nlayout.html | 2 +- templates/registration/login.html | 2 +- 13 files changed, 50 insertions(+), 56 deletions(-) diff --git a/INSTALL b/INSTALL index a913f2faf..9f77a5863 100644 --- a/INSTALL +++ b/INSTALL @@ -11,7 +11,7 @@ Requirements How to install -------------- -Download Mailng's tarball and extract it:: +Download Modoboa's tarball and extract it:: # tar xzf modoboa-.tar.gz # mv modoboa- modoboa @@ -33,7 +33,7 @@ Initialise the database by running the following command:: Create the super admin account (just follow the procedure). -Since version 0.8, MailNG is using south to handle schema +Since version 0.8, Modoboa is using south to handle schema migration. In order to finish the database creation, you must run the first migration like this:: @@ -80,7 +80,7 @@ Finally, run the following commands: Time zone and language ---------------------- -MailNG is available in english, french and german. You can choose +Modoboa is available in english, french and german. You can choose which language to use by modifying the LANGUAGE_CODE variable inside settings.py:: @@ -98,7 +98,7 @@ variable. For example:: Host configuration ------------------ -Before testing MailNG, you must create a group and a user that will be +Before testing Modoboa, you must create a group and a user that will be used to store mails on the host filesystem. There is only one group/user needed because we are in a virtual hosting configuration (ie. users with non-UNIX accounts). @@ -120,15 +120,15 @@ file and add the following inside:: Testing installation -------------------- -As a typical Django application, MailNG can be tested using a simple web +As a typical Django application, Modoboa can be tested using a simple web server. Just run this command to start it:: # python manage.py runserver -You will be able to play with MailNG by looking at +You will be able to play with Modoboa by looking at http://:8000/modoboa/admin/. -Tips to link Mailng with postfix +Tips to link Modoboa with postfix -------------------------------- First, define following maps on your server (this should work with @@ -173,14 +173,14 @@ Then, use the following configuration in your /etc/postfix/main.cf file virtual_alias_maps = mysql:/etc/postfix/sql-aliases.cf # Stuff after -NB: MailNG supports both maildir and mbox formats. You can specify +NB: Modoboa supports both maildir and mbox formats. You can specify which format to use by modifying the MAILBOX_TYPE parameter available in the admin panel. Tips to activate auto-reply messages in Postifx ----------------------------------------------- -Since version 0.6, mail users can define an auto-reply message with MailNG. +Since version 0.6, mail users can define an auto-reply message with Modoboa. To activate the extension, edit your settings.py and add the following line inside the INSTALLED_APPS variable:: @@ -193,7 +193,7 @@ Run the following command to activate the component:: # DJANGO_SETTINGS_MODULE=modoboa.settings \ /scripts/extension.py postfix-autoreply on -Then run the following commands to update MailNG SQL schema and content:: +Then run the following commands to update Modoboa SQL schema and content:: # python manage.py syncdb # python manage.py migrate postfix-autoreply @@ -247,7 +247,7 @@ NB: Be sure that both 'autoreply' and 'autoreply.py' scripts (located inside the 'scripts/postfix_autoreply' directory) have good permissions (ie. 0755). -Tips to link Mailng with dovecot +Tips to link Modoboa with dovecot -------------------------------- If you are using 'maildir' format to store mailboxes, add the @@ -331,7 +331,7 @@ user quotas:: user_query = SELECT path AS home, uid, gid, concat('*:storage=', quota, 'M') AS quota_rule FROM admin_mailbox WHERE full_address = '%u' -Tips to serve Mailng behind Apache2 +Tips to serve Modoboa behind Apache2 ------------------------------------ First, be sure to have apache2 and mod_python installed on your @@ -424,7 +424,7 @@ Below is an example of a working configuration:: Don't forget to update the inet_acl list if you plan to release from the network. -Once amavisd-new is configured, just tell MailNG where it can find the +Once amavisd-new is configured, just tell Modoboa where it can find the "release server" by modifying following parameters in the admin panel:: # "unix" or "inet" @@ -437,7 +437,7 @@ Once amavisd-new is configured, just tell MailNG where it can find the AM_PDP_HOST = "127.0.0.1" AM_PDP_PORT = 9998 -Last point, MailNG provides a simple script that periodically purge +Last point, Modoboa provides a simple script that periodically purge the amavisd-new quarantine database. If you plan to use it, you can add the following line inside root's crontab:: @@ -445,7 +445,7 @@ add the following line inside root's crontab:: DJANGO_SETTINGS_MODULE=modoboa.settings \ /extensions/amavis_quarantine/cleanup.py -Replace modoboa_dir with the installation path of MailNG. +Replace modoboa_dir with the installation path of Modoboa. By default, messages older than 14 days are automatically purged. You can modify this value by changing the MAX_MESSAGES_AGE parameter in the admin panel. @@ -497,16 +497,16 @@ crontab:: */5 * * * * PYTHONPATH= DJANGO_SETTINGS_MODULE=modoboa.settings /scripts/stats/logparser.py -Replace modoboa_dir with the installation path of MailNG. +Replace modoboa_dir with the installation path of Modoboa. Graphics are automatically created after each new parsing. Using the webmail component --------------------------- -MailNG provides a simple webmail component (you can browse, read and +Modoboa provides a simple webmail component (you can browse, read and compose messages). With this feature, it is possible to deploy an almost -standalone emails platform just with MailNG. +standalone emails platform just with Modoboa. The following requirements are needed before going further:: @@ -520,12 +520,12 @@ Just run the following command to activate the component:: /scripts/extension.py webmail on Sometimes, inline images are integrated inside emails. To display -them, MailNG stores them inside a temporary folder. Make sure the +them, Modoboa stores them inside a temporary folder. Make sure the following path exists, otherwise create it:: # mkdir /static/tmp -The user that is running MailNG will need the write permission inside +The user that is running Modoboa will need the write permission inside this folder. Next, go to the admin panel and modify the following parameters in diff --git a/README b/README index 3ec700bdc..d6522589f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Mailng is a light web messaging solution. It provides different tools that +Modoboa is a light web messaging solution. It provides different tools that facilitate virtual domains hosting. It is designed to be integrated with email servers like postfix (http://www.postfix.org/) and/or dovecot (http://www.dovecot.org/). @@ -10,9 +10,9 @@ Available components: * Graphical statistics about emails traffic, * webmail. -Django is needed to use Mailng (http://www.djangoproject.com/) +Django is needed to use Modoboa (http://www.djangoproject.com/) -The following external tools are provided with MailNG: +The following external tools are provided with Modoboa: * Mootools version 1.2+ (http://www.mootools.net/), * SqueezeBox version 1.1+ (http://digitarald.de/project/squeezebox/), * Calendar (http://electricprism.com/aeron/calendar/) diff --git a/extensions/postfix_autoreply/main.py b/extensions/postfix_autoreply/main.py index feb1bb850..0527fb2cd 100644 --- a/extensions/postfix_autoreply/main.py +++ b/extensions/postfix_autoreply/main.py @@ -3,7 +3,7 @@ """ Postfix auto-replies plugin. -This module provides a way to integrate MailNG auto-reply +This module provides a way to integrate Modoboa auto-reply functionality into Postfix. """ diff --git a/extensions/webmail/views.py b/extensions/webmail/views.py index bc5bfa74f..f37ba0cb6 100644 --- a/extensions/webmail/views.py +++ b/extensions/webmail/views.py @@ -223,7 +223,7 @@ def send_mail(request, withctx=False, origmsg=None, posturl=None): msg["From"] = request.POST["from_"] msg["To"] = request.POST["to"] msg["Message-ID"] = make_msgid() - msg["User-Agent"] = "MailNG" + msg["User-Agent"] = "Modoboa" msg["Date"] = formatdate(time.time(), True) if origmsg and origmsg.has_key("Message-ID"): msg["References"] = msg["In-Reply-To"] = origmsg["Message-ID"] diff --git a/lib/events.py b/lib/events.py index ffb0aaecd..9d5638325 100644 --- a/lib/events.py +++ b/lib/events.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -This module provides a simple way of managing events between MailNG +This module provides a simple way of managing events between Modoboa core application and additional components. """ diff --git a/lib/parameters.py b/lib/parameters.py index 6fa8f20e1..7fc0c5df4 100644 --- a/lib/parameters.py +++ b/lib/parameters.py @@ -5,7 +5,7 @@ from modoboa.lib.models import * """ This interface provides a simple way to declare and store parameters -in MailNG's database. +in Modoboa's database. Core components or extensions can register their own parameters, which will be available and modifiable directly from the web interface. diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 5f91f3c63..697217fe8 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-24 13:33+0200\n" +"POT-Creation-Date: 2010-07-13 17:13+0200\n" "PO-Revision-Date: 2010-06-10 23:21+0200\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: LANGUAGE \n" @@ -329,12 +329,12 @@ msgstr "Von" #: extensions/amavis_quarantine/sql_listing.py:15 #: extensions/webmail/forms.py:8 extensions/webmail/lib.py:25 -#: extensions/webmail/views.py:332 templates/common/email_searchbar.html:7 +#: extensions/webmail/views.py:333 templates/common/email_searchbar.html:7 msgid "Subject" msgstr "Betreff" #: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:28 -#: extensions/webmail/views.py:333 +#: extensions/webmail/views.py:334 msgid "Date" msgstr "Datum" @@ -440,10 +440,6 @@ msgstr "Nachrichten-Header" msgid "Bad MIME" msgstr "Schlechtes MIME" -#: extensions/dummy_plugin/main.py:24 -msgid "Dummy" -msgstr "" - #: extensions/postfix_autoreply/forms.py:18 msgid "This date is over" msgstr "Das Datum ist vorbei" @@ -686,15 +682,15 @@ msgstr "Einfaches IMAP-Webmail" msgid "Webmail" msgstr "Webmail" -#: extensions/webmail/views.py:58 lib/email_listing.py:124 +#: extensions/webmail/views.py:63 lib/email_listing.py:124 msgid "This folder contains no messages" msgstr "Dieser Ordner enthält keine Einträge" -#: extensions/webmail/views.py:313 +#: extensions/webmail/views.py:314 msgid "wrote:" msgstr "schrieb:" -#: extensions/webmail/views.py:331 +#: extensions/webmail/views.py:332 msgid "Original message" msgstr "Gesendete Nachrichten" @@ -931,8 +927,9 @@ msgid "Save" msgstr "Speichern" #: templates/registration/login.html:8 -msgid "Welcome to MailNG" -msgstr "Willkommen bei MailNG" +#, fuzzy +msgid "Welcome to Modoboa" +msgstr "Willkommen bei Modoboa" #: templates/registration/login.html:28 msgid "Welcome" diff --git a/locale/de/LC_MESSAGES/djangojs.po b/locale/de/LC_MESSAGES/djangojs.po index 48c15fa06..bcb386e2b 100644 --- a/locale/de/LC_MESSAGES/djangojs.po +++ b/locale/de/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-14 09:54+0200\n" +"POT-Creation-Date: 2010-07-13 17:13+0200\n" "PO-Revision-Date: 2010-06-10 22:45+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index b902e63f1..1dd54cf1d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-24 13:33+0200\n" +"POT-Creation-Date: 2010-07-13 17:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Antoine Nguyen \n" "Language-Team: LANGUAGE \n" @@ -328,12 +328,12 @@ msgstr "De" #: extensions/amavis_quarantine/sql_listing.py:15 #: extensions/webmail/forms.py:8 extensions/webmail/lib.py:25 -#: extensions/webmail/views.py:332 templates/common/email_searchbar.html:7 +#: extensions/webmail/views.py:333 templates/common/email_searchbar.html:7 msgid "Subject" msgstr "Sujet" #: extensions/amavis_quarantine/sql_listing.py:16 extensions/webmail/lib.py:28 -#: extensions/webmail/views.py:333 +#: extensions/webmail/views.py:334 msgid "Date" msgstr "" @@ -439,10 +439,6 @@ msgstr "Mauvais entête" msgid "Bad MIME" msgstr "Mauvais type MIME" -#: extensions/dummy_plugin/main.py:24 -msgid "Dummy" -msgstr "" - #: extensions/postfix_autoreply/forms.py:18 msgid "This date is over" msgstr "Cette date est dépassée" @@ -684,15 +680,15 @@ msgstr "" msgid "Webmail" msgstr "" -#: extensions/webmail/views.py:58 lib/email_listing.py:124 +#: extensions/webmail/views.py:63 lib/email_listing.py:124 msgid "This folder contains no messages" msgstr "Ce dossier ne contient pas de messages" -#: extensions/webmail/views.py:313 +#: extensions/webmail/views.py:314 msgid "wrote:" msgstr "a écrit :" -#: extensions/webmail/views.py:331 +#: extensions/webmail/views.py:332 msgid "Original message" msgstr "Message original" @@ -929,8 +925,9 @@ msgid "Save" msgstr "Sauvegarder" #: templates/registration/login.html:8 -msgid "Welcome to MailNG" -msgstr "Bienvenue dans MailNG" +#, fuzzy +msgid "Welcome to Modoboa" +msgstr "Bienvenue dans Modoboa" #: templates/registration/login.html:28 msgid "Welcome" diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po index d1d3e00dc..36f29515e 100644 --- a/locale/fr/LC_MESSAGES/djangojs.po +++ b/locale/fr/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-14 09:54+0200\n" +"POT-Creation-Date: 2010-07-13 17:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/settings_sample.py b/settings_sample.py index bd1067a1a..ab2b0d8af 100644 --- a/settings_sample.py +++ b/settings_sample.py @@ -88,7 +88,7 @@ INSTALLED_APPS = ( 'modoboa.admin', 'modoboa.userprefs', - # MailNG extensions here. + # Modoboa extensions here. # 'modoboa.extensions.postfix_autoreply' ) diff --git a/templates/nlayout.html b/templates/nlayout.html index c9d9196f5..dd1e7d2be 100644 --- a/templates/nlayout.html +++ b/templates/nlayout.html @@ -5,7 +5,7 @@ - MailNG - {%block pagetitle %}{% endblock %} + Modoboa - {%block pagetitle %}{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index cf8f2e595..2e1d65ed5 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -5,7 +5,7 @@ - {% trans "Welcome to MailNG" %} + {% trans "Welcome to Modoboa" %}