i18n for recycle and edit page

locale/zh_CN/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-04 12:57+0800\n"
+"POT-Creation-Date: 2012-11-04 13:28+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"
@@ -140,6 +140,20 @@ msgstr ""
 msgid "简体中文"
 msgstr ""
 
+#: views.py:1158
+msgid "Failed to delete file."
+msgstr "删除文件出错。"
+
+#: views.py:1165
+#, python-format
+msgid "%s successfully deleted."
+msgstr "%s 删除成功。"
+
+#: views.py:1167
+#, python-format
+msgid "Internal error. Failed to delete %s."
+msgstr "内部错误。删除 %s 失败。"
+
 #: templates/404.html:6
 msgid "Sorry, but the requested page could not be found."
 msgstr "对不起，你访问的页面不存在。"
@@ -168,7 +182,8 @@ msgstr "确认密码"
 
 #: templates/add_user_form.html:17 templates/decrypt_repo_form.html:15
 #: templates/repo.html:168 templates/repo.html.py:178 templates/repo.html:198
-#: templates/repo.html.py:209 templates/repo_update_file.html:21
+#: templates/repo.html.py:209 templates/repo_edit_file.html:40
+#: templates/repo_edit_file.html.py:45 templates/repo_update_file.html:21
 #: templates/repo_upload_file.html:17 templates/repo_view_file.html:141
 #: templates/repo_view_file.html.py:167 templates/userinfo.html:87
 #: templates/registration/login.html:13
@@ -341,16 +356,16 @@ msgid "Last Modifier"
 msgstr "最后修改者"
 
 #: templates/file_revisions.html:25 templates/repo.html:98
-#: templates/repo_history_view.html:51
+#: templates/repo_history_view.html:51 templates/repo_recycle_view.html:35
 msgid "Size"
 msgstr "大小"
 
 #: templates/file_revisions.html:26 templates/public_home.html:25
-#: templates/repo.html:99 templates/repo_view_snapshot.html:18
+#: templates/repo.html:99 templates/repo_recycle_view.html:36
-#: templates/sys_group_admin.html:14 templates/sys_org_admin.html:15
+#: templates/repo_view_snapshot.html:18 templates/sys_group_admin.html:14
-#: templates/sys_seafadmin.html:14 templates/sys_useradmin.html:5
+#: templates/sys_org_admin.html:15 templates/sys_seafadmin.html:14
-#: templates/sys_useradmin.html.py:17 templates/userinfo.html:40
+#: templates/sys_useradmin.html:5 templates/sys_useradmin.html.py:17
-#: templates/snippets/my_owned_repos.html:21
+#: templates/userinfo.html:40 templates/snippets/my_owned_repos.html:21
 #: templates/snippets/my_owned_repos.html:60
 msgid "Operations"
 msgstr "操作"
@@ -365,7 +380,8 @@ msgstr "(当前版本)"
 msgid "Unknown"
 msgstr "未知"
 
-#: templates/file_revisions.html:50 templates/repo_view_snapshot.html:44
+#: templates/file_revisions.html:50 templates/repo_recycle_view.html:46
+#: templates/repo_recycle_view.html:63 templates/repo_view_snapshot.html:44
 msgid "Restore"
 msgstr "还原"
 
@@ -388,7 +404,8 @@ msgstr "个人基本信息"
 msgid "No Nickname"
 msgstr "暂无昵称"
 
-#: templates/myhome.html:15 templates/repo_view_file.html:116
+#: templates/myhome.html:15 templates/repo_edit_file.html:18
+#: templates/repo_view_file.html:116
 msgid "Edit"
 msgstr "编辑"
 
@@ -520,10 +537,10 @@ msgid "New Library"
 msgstr "新建资料库"
 
 #: templates/public_home.html:21 templates/repo.html:97
-#: templates/repo_history_view.html:50 templates/sys_group_admin.html:11
+#: templates/repo_history_view.html:50 templates/repo_recycle_view.html:33
-#: templates/sys_org_admin.html:11 templates/sys_seafadmin.html:11
+#: templates/sys_group_admin.html:11 templates/sys_org_admin.html:11
-#: templates/userinfo.html:38 templates/userinfo.html.py:63
+#: templates/sys_seafadmin.html:11 templates/userinfo.html:38
-#: templates/snippets/my_owned_repos.html:18
+#: templates/userinfo.html.py:63 templates/snippets/my_owned_repos.html:18
 #: templates/snippets/my_owned_repos.html:56
 #: templates/snippets/repo_create_form.html:4
 msgid "Name"
@@ -606,7 +623,8 @@ msgstr "系统自动生成"
 msgid "You can't access this library."
 msgstr "无法在线查看该资料库。"
 
-#: templates/repo.html:76 templates/repo_history_view.html:36
+#: templates/repo.html:76 templates/repo_edit_file.html:20
+#: templates/repo_history_view.html:36 templates/repo_recycle_view.html:16
 msgid "Current path: "
 msgstr "当前路径："
 
@@ -651,6 +669,7 @@ msgid "Copy"
 msgstr "复制"
 
 #: templates/repo.html:128 templates/repo_history_view.html:64
+#: templates/repo_recycle_view.html:58
 msgid "File"
 msgstr "文件"
 
@@ -667,8 +686,9 @@ msgid "Directory Name"
 msgstr "目录名"
 
 #: templates/repo.html:169 templates/repo.html.py:179 templates/repo.html:199
-#: templates/repo.html.py:210 templates/repo_update_file.html:27
+#: templates/repo.html.py:210 templates/repo_edit_file.html:47
-#: templates/repo_upload_file.html:23 templates/snippets/events.html:73
+#: templates/repo_update_file.html:27 templates/repo_upload_file.html:23
+#: templates/snippets/events.html:73
 msgid "Cancel"
 msgstr "取消"
 
@@ -720,11 +740,20 @@ msgstr "文件"
 msgid "directory "
 msgstr "目录"
 
+#: templates/repo_edit_file.html:41
+msgid "Continue editing"
+msgstr "继续修改"
+
+#: templates/repo_edit_file.html:42
+msgid "Preview"
+msgstr "预览"
+
 #: templates/repo_history.html:7
 msgid "modification history"
 msgstr "修改历史"
 
-#: templates/repo_history.html:8 templates/repo_view_file.html:31
+#: templates/repo_history.html:8 templates/repo_recycle_view.html:9
+#: templates/repo_view_file.html:31
 msgid "Back to Library"
 msgstr "返回资料库"
 
@@ -780,10 +809,19 @@ msgstr "返回镜像列表"
 msgid "Can't view this library"
 msgstr "无法在线查看该资料库。"
 
-#: templates/repo_history_view.html:56
+#: templates/repo_history_view.html:56 templates/repo_recycle_view.html:41
 msgid "Directory"
 msgstr "目录"
 
+#: templates/repo_recycle_view.html:8 templates/repo_recycle_view.html:17
+#: templates/repo_view_file.html:30 templates/repo_view_file.html.py:40
+msgid "'s trash"
+msgstr "文件回收站"
+
+#: templates/repo_recycle_view.html:34
+msgid "Delete Time"
+msgstr "删除时间"
+
 #: templates/repo_update_file.html:7
 msgid "Update file"
 msgstr "更新文件"
@@ -828,10 +866,6 @@ msgstr "历史"
 msgid "Back to file versions"
 msgstr "返回文件版本列表"
 
-#: templates/repo_view_file.html:30 templates/repo_view_file.html.py:40
-msgid "'s trash"
-msgstr "文件回收站"
-
 #: templates/repo_view_file.html:37
 msgid "Current Path: "
 msgstr "当前路径："
@@ -1296,6 +1330,10 @@ msgstr "修改详情"
 msgid "My Groups"
 msgstr "我的群组"
 
+#: templates/snippets/my_groups.html:18
+msgid "Create a group now"
+msgstr "现在创建群组"
+
 #: templates/snippets/my_owned_repos.html:7
 msgid "Mine"
 msgstr "我拥有的"
@@ -1349,8 +1387,8 @@ msgstr "还没有资料库共享给你"
 
 #: templates/snippets/my_owned_repos.html:92
 msgid ""
-"Libraries shared to you will be listed here. You can download this library. "
+"Libraries shared to you will be listed here. Libraries shared as writable "
-"Files you add into the downloaded library will be synchronized automatically."
+"can be downloaded and synced. Read only libraries can only be viewed online."
 msgstr ""
 "这里会显示共享给你的资料库。你可以下载这个资料库。你可以添加文件到这个下载下"
 "来的资料库，这些文件会自动同步到服务器。"

templates/repo_edit_file.html

@@ -1,5 +1,5 @@
 {% extends base_template %}
-{% load seahub_tags %}
+{% load seahub_tags i18n %}
 
 {% block extra_style %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}codemirror/codemirror.css" />
@@ -15,9 +15,9 @@
 {% endblock %}
 
 {% block main_panel %}
-    <h2>编辑 {{ u_filename }}</h2>
+    <h2>{% trans "Edit" %} {{ u_filename }}</h2>
     <p class="path">
-         当前路径：
+         {% trans "Current path: " %}
          {% for name, link in zipped %}
             {% if not forloop.last %}
                 <a href="{{ SITE_ROOT }}repo/{{ repo.id }}/?p={{ link|urlencode }}">{{ name }}</a> /               
@@ -37,14 +37,14 @@
     <div id="op-after-edit" class="w100 ovhd hide">
         {% if filetype == 'Markdown' %}
         <div class="fleft">
-            <button id="file-edit-submit">提交</button>
+            <button id="file-edit-submit">{% trans "Submit" %}</button>
-            <button id="source-code-btn" class="hide">继续编辑</button>
+            <button id="source-code-btn" class="hide">{% trans "Continue editing" %}</button>
-            <button id="preview-btn">预览</button>
+            <button id="preview-btn">{% trans "Preview" %}</button>
         </div>
         {% else %}
-        <button id="file-edit-submit" class="fleft">提交</button>
+        <button id="file-edit-submit" class="fleft">{% trans "Submit" %}</button>
         {% endif %}
-        <button data="{{ SITE_ROOT }}repo/{{ repo.id }}/files/?p={{ path }}" id="file-edit-cancel" class="fright">取消修改</button>
+        <button data="{{ SITE_ROOT }}repo/{{ repo.id }}/files/?p={{ path }}" id="file-edit-cancel" class="fright">{% trans "Cancel" %}</button>
     </div>
 {% endblock %}
 

templates/repo_recycle_view.html

@@ -1,20 +1,20 @@
 {% extends base_template %}
 
-{% load seahub_tags avatar_tags %}
+{% load seahub_tags avatar_tags i18n %}
 {% load url from future %}
 
 {% block main_panel %}
     <div class="w100 ovhd">
-        <h2 class="fleft">{{repo.props.name}} 的文件回收站</h2>
+        <h2 class="fleft">{{repo.props.name}} {% trans "'s trash" %}</h2>
-        <button data="{% url 'repo' repo.id %}" class="fright" id="back">返回资料库</button>
+        <button data="{% url 'repo' repo.id %}" class="fright" id="back">{% trans "Back to Library" %}</button>
     </div>
 
     <div class="repo-file-list-outer-container">
         <div class="repo-file-list-inner-container">
             <div class="repo-file-list-topbar">
                 <p class="path">
-                当前路径：
+                {% trans "Current path: " %}
-		<a href="{% url 'repo_recycle_view' repo.id %}">{{repo.props.name}} 的文件回收站</a>
+		<a href="{% url 'repo_recycle_view' repo.id %}">{{repo.props.name}} {% trans "'s trash" %}</a>
 		{% if not show_recycle_root %}
                     {% for name, link in zipped %}
                         {% if not forloop.last %}
@@ -30,20 +30,20 @@
             <table class="repo-file-list">
                 <tr>
                     <th width="5%"></th>
-                    <th width="60%">名字</th>
+                    <th width="60%">{% trans "Name" %}</th>
-		    <th width="15%">删除时间</th>
+		    <th width="15%">{% trans "Delete Time" %}</th>
-                    <th width="10%">大小</th>
+                    <th width="10%">{% trans "Size" %}</th>
-		    <th width="10%">操作</th>
+		    <th width="10%">{% trans "Operations" %}</th>
                 </tr>
 
                 {% for dirent in dir_list %}
                 <tr>
-                    <td class="icon-container"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="目录" /></td>
+                    <td class="icon-container"><img src="{{ MEDIA_URL }}img/folder-icon-24.png" alt="{% trans "Directory" %}" /></td>
 		    {% if show_recycle_root %}
 		    <td><a href="{% url 'repo_recycle_view' repo.id %}?commit_id={{ dirent.commit_id }}&base={{ dirent.basedir|urlencode }}&p=/{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a></td>
                     <td>{{ dirent.delete_time|translate_commit_time }}</td>
 		    <td></td>
-		    <td><a class="op" href="{% url 'repo_revert_dir' repo.id %}?commit={{ dirent.commit_id }}&p={{ dirent.basedir|urlencode }}{{dirent.obj_name|urlencode}}">还原</a></td>
+		    <td><a class="op" href="{% url 'repo_revert_dir' repo.id %}?commit={{ dirent.commit_id }}&p={{ dirent.basedir|urlencode }}{{dirent.obj_name|urlencode}}">{% trans "Restore" %}</a></td>
 		    {% else %}
                     <td><a href="{% url 'repo_recycle_view' repo.id %}?commit_id={{ commit_id }}&base={{ basedir|urlencode }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">{{ dirent.obj_name }}</a></td>
 		    <td></td>
@@ -55,12 +55,12 @@
 
                 {% for dirent in file_list %}
                 <tr>
-                    <td class="icon-container"><img src="{{ MEDIA_URL }}img/file/{{ dirent.obj_name|file_icon_filter }}" alt="文件" /></td>
+                    <td class="icon-container"><img src="{{ MEDIA_URL }}img/file/{{ dirent.obj_name|file_icon_filter }}" alt="{% trans "File" %}" /></td>
 		    {% if show_recycle_root %}
                     <td><a class="op" href="{% url 'repo_view_file' repo.id %}?obj_id={{ dirent.obj_id }}&commit_id={{ dirent.commit_id }}&base={{ dirent.basedir|urlencode }}&p=/{{ dirent.obj_name|urlencode }}&from=recycle">{{ dirent.obj_name }}</a></td>
                     <td>{{ dirent.delete_time|translate_commit_time }}</td>
                     <td>{{ dirent.file_size|filesizeformat }}</td>
-                    <td><a class="op" href="{% url 'repo_revert_file' repo.id %}?commit={{ dirent.commit_id }}&p={{ dirent.basedir|urlencode }}{{dirent.obj_name|urlencode}}&from=recycle">还原</a></td>
+                    <td><a class="op" href="{% url 'repo_revert_file' repo.id %}?commit={{ dirent.commit_id }}&p={{ dirent.basedir|urlencode }}{{dirent.obj_name|urlencode}}&from=recycle">{% trans "Restore" %}</a></td>
 		    {% else %}
                     <td><a class="op" href="{% url 'repo_view_file' repo.id %}?obj_id={{ dirent.obj_id }}&commit_id={{ commit_id }}&base={{ basedir|urlencode }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}&from=recycle">{{ dirent.props.obj_name }}</a></td>
 		    <td></td>

templates/snippets/my_groups.html

@@ -15,7 +15,7 @@
 </ul>
 {% else %}
 <div class="info-item-bottom">
-  <p><a href="{% url 'group_list' %}">Create a group now</a></p>
+  <p><a href="{% url 'group_list' %}">{% trans "Create a group now" %}</a></p>
 </div>
 {% endif %}
 </div>

templates/snippets/my_owned_repos.html

@@ -89,7 +89,7 @@
 {% else %}
 <div class="empty-tips">
   <h2 class="center-contents">{% trans "No library is shared to you" %}</h2>
-  <p>{% trans "Libraries shared to you will be listed here. You can download this library. Files you add into the downloaded library will be synchronized automatically." %}</p>
+  <p>{% trans "Libraries shared to you will be listed here. Libraries shared as writable can be downloaded and synced. Read only libraries can only be viewed online." %}</p>
 </div>
 {% endif %}
 </div>

views.py

@@ -1155,16 +1155,16 @@ def repo_set_access_property(request, repo_id):
 @login_required    
 def repo_del_file(request, repo_id):
     if get_user_permission(request, repo_id) != 'rw':
-        return render_permission_error(request, '无法删除该文件')
+        return render_permission_error(request, _('Failed to delete file.'))
 
     parent_dir = request.GET.get("p", "/")
     file_name = request.GET.get("file_name")
     user = request.user.username
     try:
         seafserv_threaded_rpc.del_file(repo_id, parent_dir,file_name, user)
-        messages.add_message(request, messages.INFO, u'%s 删除成功。' % file_name)
+        messages.success(request, _(u'%s successfully deleted.') % file_name)
     except:
-        messages.add_message(request, messages.ERROR, u'内部错误。%s 删除失败。' % file_name)
+        messages.error(request, _(u'Internal error. Failed to delete %s.') % file_name)
 
     url = reverse('repo', args=[repo_id]) + ('?p=%s' % urllib2.quote(parent_dir.encode('utf-8')))
     return HttpResponseRedirect(url)