Merge pull request #72 from tuxis-ie/master

Folders are incorrectly called mailboxes.

modoboa_webmail/forms.py

@@ -362,11 +362,11 @@ class UserSettings(param_forms.UserParametersForm):
 
     mboxes_col_width = forms.IntegerField(
         initial=200,
-        label=_("Mailboxes container's width"),
-        help_text=_("The width of the mailbox list container")
+        label=_("Folder container's width"),
+        help_text=_("The width of the folder list container")
     )
 
-    sep2 = form_utils.SeparatorField(label=_("Mailboxes"))
+    sep2 = form_utils.SeparatorField(label=_("Folders"))
 
     trash_folder = forms.CharField(
         initial="Trash",

modoboa_webmail/static/modoboa_webmail/js/webmail.js

@@ -195,7 +195,7 @@ Webmail.prototype = {
             end_of_list_reached: function($element) {
                 $element.append(
                     $("<div class='alert alert-info text-center' />").html(
-                        gettext("No more message in this mailbox.")
+                        gettext("No more message in this folder.")
                     )
                 );
             }
@@ -691,7 +691,7 @@ Webmail.prototype = {
         var $link = get_target(e, "a");
         e.preventDefault();
         if ($link.hasClass("disabled")) return;
-        if (!confirm(gettext("Remove the selected mailbox?"))) {
+        if (!confirm(gettext("Remove the selected folder?"))) {
             return;
         }
 
@@ -704,7 +704,7 @@ Webmail.prototype = {
         }).done($.proxy(function(data) {
             this.remove_mbox_from_tree(this.navobject.getparam("mbox"));
             this.poller.resume();
-            $("body").notify("success", gettext("Mailbox removed"), 2000);
+            $("body").notify("success", gettext("Folder removed"), 2000);
         }, this));
     },
 

modoboa_webmail/templatetags/webmail_tags.py

@@ -202,20 +202,20 @@ def mboxes_menu():
         {"name": "newmbox",
          "url": reverse("modoboa_webmail:folder_add"),
          "img": "fa fa-plus",
-         "label": _("Create a new mailbox"),
+         "label": _("Create a new folder"),
          "modal": True,
          "modalcb": "webmail.mboxform_cb",
          "closecb": "webmail.mboxform_close",
          "class": "btn-default btn-xs"},
         {"name": "editmbox",
          "url": reverse("modoboa_webmail:folder_change"),
          "img": "fa fa-edit",
-         "label": _("Edit the selected mailbox"),
+         "label": _("Edit the selected folder"),
          "class": "btn-default btn-xs"},
         {"name": "removembox",
          "url": reverse("modoboa_webmail:folder_delete"),
          "img": "fa fa-trash",
-         "label": _("Remove the selected mailbox"),
+         "label": _("Remove the selected folder"),
          "class": "btn-default btn-xs"},
         {"name": "compress",
          "img": "fa fa-compress",

modoboa_webmail/tests.py

@@ -202,7 +202,7 @@ def test_new_folder(self):
         """Test folder creation."""
         url = reverse("modoboa_webmail:folder_add")
         response = self.client.get(url)
-        self.assertContains(response, "Create a new mailbox")
+        self.assertContains(response, "Create a new folder")
 
         response = self.ajax_post(url, {"name": "Test"})
         self.assertIn("newmb", response)
@@ -215,13 +215,13 @@ def test_edit_folder(self):
 
         url = "{}?name=Test".format(url)
         response = self.client.get(url)
-        self.assertContains(response, "Edit mailbox")
+        self.assertContains(response, "Edit folder")
 
         session = self.client.session
         session["webmail_navparams"] = {"inbox": "Test"}
         session.save()
         response = self.ajax_post(url, {"oldname": "Test", "name": "Toto"})
-        self.assertEqual(response["respmsg"], "Mailbox updated")
+        self.assertEqual(response["respmsg"], "Folder updated")
 
     def test_delete_folder(self):
         """Test folder removal."""

modoboa_webmail/views.py

@@ -147,7 +147,7 @@ def empty(request):
     if name != request.user.parameters.get_value("trash_folder"):
         raise BadRequest(_("Invalid request"))
     get_imapconnector(request).empty(name)
-    content = u"<div class='alert alert-info'>%s</div>" % _("Empty mailbox")
+    content = u"<div class='alert alert-info'>%s</div>" % _("Empty folder")
     return render_to_json_response({
         'listing': content, 'mailbox': name, 'pages': [1]
     })
@@ -177,14 +177,14 @@ def newfolder(request, tplname="modoboa_webmail/folder.html"):
             pf = request.POST.get("parent_folder", None)
             mbc.create_folder(form.cleaned_data["name"], pf)
             return render_to_json_response({
-                'respmsg': _("Mailbox created"),
+                'respmsg': _("Folder created"),
                 'newmb': form.cleaned_data["name"], 'parent': pf
             })
 
         return render_to_json_response(
             {'form_errors': form.errors}, status=400)
 
-    ctx = {"title": _("Create a new mailbox"),
+    ctx = {"title": _("Create a new folder"),
            "formid": "mboxform",
            "action": reverse("modoboa_webmail:folder_add"),
            "action_label": _("Create"),
@@ -203,7 +203,7 @@ def newfolder(request, tplname="modoboa_webmail/folder.html"):
 def editfolder(request, tplname="modoboa_webmail/folder.html"):
     mbc = IMAPconnector(user=request.user.username,
                         password=request.session["password"])
-    ctx = {"title": _("Edit mailbox"),
+    ctx = {"title": _("Edit folder"),
            "formid": "mboxform",
            "action": reverse("modoboa_webmail:folder_change"),
            "action_label": _("Update"),
@@ -219,7 +219,7 @@ def editfolder(request, tplname="modoboa_webmail/folder.html"):
             oldname, oldparent = separate_mailbox(
                 request.POST["oldname"], sep=mbc.hdelimiter
             )
-            res = {'respmsg': _("Mailbox updated")}
+            res = {'respmsg': _("Folder updated")}
             if form.cleaned_data["name"] != oldname \
                     or (pf != oldparent):
                 newname = form.cleaned_data["name"] if pf is None \
@@ -239,7 +239,7 @@ def editfolder(request, tplname="modoboa_webmail/folder.html"):
     if name is None:
         raise BadRequest(_("Invalid request"))
     shortname, parent = separate_mailbox(name, sep=mbc.hdelimiter)
-    ctx = {"title": _("Edit mailbox"),
+    ctx = {"title": _("Edit folder"),
            "formid": "mboxform",
            "action": reverse("modoboa_webmail:folder_change"),
            "action_label": _("Update"),