i18n for org email

base/context_processors.py

@@ -6,7 +6,7 @@ and returns a dictionary to add to the context.
 These are referenced from the setting TEMPLATE_CONTEXT_PROCESSORS and used by
 RequestContext.
 """
-from settings import SEAFILE_VERSION, SEAHUB_TITLE
+from settings import SEAFILE_VERSION, SEAHUB_TITLE, SITE_NAME, SITE_BASE
 try:
     from settings import BUSINESS_MODE
 except ImportError:
@@ -33,5 +33,6 @@ def base(request):
         'cloud_mode': request.cloud_mode,
         'org': org,
         'base_template': base_template,
+        'site_name': SITE_NAME,
         }
 

organizations/locale/zh_CN/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-29 17:43+0800\n"
+"POT-Creation-Date: 2012-10-30 17:58+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
+#: views.py:218
+msgid "Operation Successful"
+msgstr "操作成功"
+
+#: views.py:237
+msgid "Group name can only contain letters, numbers and underscore"
+msgstr "群组名称只能包含中英文字符，数字及下划线。"
+
+#: views.py:282
+msgid "Seafile Login Information"
+msgstr "Seafile 登陆信息"
+
+#: views.py:284
+msgid "Sending mail Successfully"
+msgstr "邮件发送成功"
+
+#: views.py:286
+msgid "Failed to send email"
+msgstr "邮件发送失败"
+
+#: views.py:386
+msgid "Successfully deleted member"
+msgstr "删除成员成功"
+
+#: views.py:405
+#, fuzzy, python-format
+msgid ""
+"%(from_email)s added you to organization <a href=\"%(org_url)s\">"
+"%(org_name)s</a>"
+msgstr "%(from_email)s 将你加入到团体 <a href=\"%(org_url)s\">%(org_name)s</a>"
+
+#: templates/organizations/create_org.html:5
+msgid "Create Orgnization"
+msgstr "创建团体"
+
+#: templates/organizations/create_org.html:7
+msgid "Organization Name"
+msgstr "团体名称"
+
+#: templates/organizations/create_org.html:9
+msgid "Url Prefix"
+msgstr "个性域名"
+
+#: templates/organizations/create_org.html:11
+msgid "Url prefix can only contains letters or numbers"
+msgstr "个性域名只能包含字母或数字"
+
+#: templates/organizations/create_org.html:14
+#: templates/organizations/org_admin.html:76
+msgid "Submit"
+msgstr "提交"
+
 #: templates/organizations/org_admin.html:10
 msgid "Total Org Space Used"
 msgstr "团体已用总空间"
@@ -81,10 +133,6 @@ msgstr "可以是非网站注册用户，我们会以邮件通知对方。"
 msgid "Please type an email"
 msgstr "输入不能为空。"
 
-#: templates/organizations/org_admin.html:76
-msgid "Submit"
-msgstr "提交"
-
 #: templates/organizations/org_group_admin.html:7
 #: templates/organizations/org_pubinfo.html:26
 msgid "Groups"
@@ -195,6 +243,43 @@ msgstr "所有资料库"
 msgid "Owner"
 msgstr "拥有者"
 
+#: templates/organizations/org_user_add_email.html:2
+#, python-format
+msgid "%(user)s added you to %(org_name)s organization on Seafile. "
+msgstr "%(user)s 在 Seafile 云存储上将你加入到 %(org_name)s 团体。"
+
+#: templates/organizations/org_user_add_email.html:3
+#, python-format
+msgid ""
+"\n"
+"Here is your login information:\n"
+"email: %(email)s\n"
+"password: %(password)s\n"
+"\n"
+"Please click follow link to log in:\n"
+msgstr ""
+"\n"
+"以下是您的登录信息：\n"
+"邮箱：%(email)s\n"
+"密码：%(password)s\n"
+"\n"
+"请点击以下链接登录：\n"
+
+#: templates/organizations/org_user_add_email.html:11
+#, python-format
+msgid ""
+"\n"
+"Please change your password after login.\n"
+"Thank you for using our site!\n"
+"\n"
+"The %(site_name)s team\n"
+msgstr ""
+"\n"
+"登录后请立即更改密码。\n"
+"感谢使用我们的网站！\n"
+"\n"
+"%(site_name)s 团队\n"
+
 #: templates/organizations/personal.html:14
 msgid "Account"
 msgstr "我的基本信息"

organizations/templates/organizations/create_org.html

@@ -1,16 +1,17 @@
 {% extends "myhome_base.html" %}
+{% load i18n %}
 {% block main_panel %}
 <div class="narrow-panel">
-    <h2>创建团体</h2>
+    <h2>{% trans "Create Orgnization" %}</h2>
     <form action="" method="post">
-        <label for="id_org_name">团体名称：</label>
+        <label for="id_org_name">{% trans "Organization Name" %}</label>
         {{ form.org_name}}
-        <lable for="id_url_prefix">个性域名：</label>
+        <lable for="id_url_prefix">{% trans "Url Prefix" %}</label>
         {{ form.url_prefix }}
-        <p class="note">个性域名只能包含字母或数字</p>
+        <p class="note">{% trans "Url prefix can only contains letters or numbers" %}</p>
         <p class="error hide"></p>
         {{ form.url_prefix.errors }}
-        <input type="submit" value="提交" class="submit" />
+        <input type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
 </div>
 {% endblock %}

organizations/templates/organizations/org_user_add_email.html

@@ -1,17 +1,18 @@
-{% autoescape off %}
-亲爱的 {{ email }}：
-{{ user }} 在 SeaCloud 云存储上将您加入到 {{ org_name }} 团队！
+{% load i18n %}{% autoescape off %}
+{% blocktrans %}{{ user }} added you to {{ org_name }} organization on Seafile. {% endblocktrans %}
+{% blocktrans %}
+Here is your login information:
+email: {{ email }}
+password: {{ password }}
 
-以下是您的登录信息：
-用户名： {{ email }}
-密码： {{ password }}
-
-请点击以下链接登录：
+Please click follow link to log in:
+{% endblocktrans %}
 {{ protocol }}://{{ domain }}{% url auth_login %}
+{% blocktrans %}
+Please change your password after login.
+Thank you for using our site!
 
-登录后请立即更改密码。
-感谢使用我们的网站！
-
-Seafile团队
+The {{ site_name }} team
+{% endblocktrans%}
 
 {% endautoescape %}

organizations/views.py

@@ -215,7 +215,7 @@ def unset_org_inner_pub_repo(request, url_prefix, repo_id):
     except SearpcError:
         pass
 
-    messages.add_message(request, messages.INFO, '操作成功')
+    messages.add_message(request, messages.INFO, _('Operation Successful'))
     
     return HttpResponseRedirect(reverse(org_shareadmin, args=[url_prefix]))
 
@@ -234,7 +234,7 @@ def org_groups(request, url_prefix):
         
         group_name = request.POST.get('group_name')
         if not validate_group_name(group_name):
-            result['error'] = u'群组名称只能包含中英文字符，数字及下划线。'
+            result['error'] = _(u'Group name can only contain letters, numbers and underscore')
             return HttpResponse(json.dumps(result), content_type=content_type)
         
         try:
@@ -275,14 +275,15 @@ def send_org_user_add_mail(request, email, password, org_name):
         'password': password,
         'domain': domain,
         'protocol': use_https and 'https' or 'http',
+        'site_name': seahub_settings.SITE_NAME,
         }
 
     try:
-        send_mail(u'SeaCloud注册信息', t.render(Context(c)),
+        send_mail(_(u'Seafile Login Information'), t.render(Context(c)),
                   None, [email], fail_silently=False)
-        messages.add_message(request, messages.INFO, u'邮件发送成功。')
+        messages.add_message(request, messages.INFO, _(u'Sending mail Successfully'))
     except:
-        messages.add_message(request, messages.ERROR, u'邮件发送失败。')
+        messages.add_message(request, messages.ERROR, _(u'Failed to send email'))
     
 @login_required
 @org_staff_required
@@ -382,9 +383,9 @@ def org_user_remove(request, url_prefix, user):
     url_prefix = request.user.org['url_prefix']
     remove_org_user(org_id, user)
 
-    messages.success(request, u"删除成功")
+    messages.success(request, _(u"Successfully deleted member"))
     
-    return HttpResponseRedirect(reverse('org_useradmin', args=[url_prefix]))
+    return HttpResponseRedirect(reverse('org_admin', args=[url_prefix]))
 
 def org_msg(request):
     """
@@ -401,8 +402,10 @@ def org_msg(request):
                 org_prefix = d['org_prefix']
                 org_url = reverse('org_public', args=[org_prefix])
                 
-                msg = u'%s 将你加入到团体 <a href="%s">%s</a>' % (
-                    from_email, org_url, org_name)
+                msg = _(u'%(from_email)s added you to organization <a href="%(org_url)s">%(org_name)s</a>') % \
+                {'from_email':from_email,
+                 'org_url': org_url,
+                 'org_name': org_name}
                 orgmsg_list.append(msg)
             except json.decoder.JSONDecodeError:
                 # This message is not json format, just list to user.

settings.py

@@ -193,8 +193,8 @@ MAX_UPLOAD_FILE_SIZE        = 100 * 1024 * 1024 # 100 MB
 MAX_UPLOAD_FILE_NAME_LEN    = 256
 
 # Base url and name used in email sending
-SITE_BASE = 'http://gonggeng.org/'
-SITE_NAME = 'gonggeng'
+SITE_BASE = 'http://seafile.com'
+SITE_NAME = 'Seafile'
 
 # Set to True when user will be activaed after registration,
 # and no email sending