diff --git a/group/error_msg.py b/group/error_msg.py index c21270524e..59757e2dc6 100644 --- a/group/error_msg.py +++ b/group/error_msg.py @@ -13,12 +13,12 @@ msg = _("Failed to create org group.") # group_add_member rpc msg = _("Permission error: only group staff can add member") -msg = _("Group not exists") +msg = _("Group does not exist") msg = _("Group is full") msg = _("Failed to add member to group") # group_remove_member rpc msg = _("Only group staff can remove member") -msg = _("Group not exists") +msg = _("Group does not exist") msg = _("Can not remove myself") diff --git a/group/locale/zh_CN/LC_MESSAGES/django.po b/group/locale/zh_CN/LC_MESSAGES/django.po index 40a2ce4e62..c4148db8e3 100644 --- a/group/locale/zh_CN/LC_MESSAGES/django.po +++ b/group/locale/zh_CN/LC_MESSAGES/django.po @@ -38,7 +38,7 @@ msgid "Permission error: only group staff can add member" msgstr "只有群组管理员可以添加成员。" #: error_msg.py:16 error_msg.py:22 -msgid "Group not exists" +msgid "Group does not exist" msgstr "群组不存在。" #: error_msg.py:17 diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index 07bfdabee0..297a7806e5 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -164,7 +164,7 @@ msgid "Duplicated filename" msgstr "Дубликат файла" #: views.py:470 views.py:1173 views.py:1525 views.py:2388 -msgid "File not exists" +msgid "File does not exist" msgstr "Файл не существует" #: views.py:472 @@ -205,11 +205,11 @@ msgid "Invalid arguments" msgstr "Недопустимые аргументы" #: views.py:692 views.py:787 views.py:2217 views.py:2635 -msgid "Library not exists" +msgid "Library does not exist" msgstr "Библиотека не существует" #: views.py:694 -msgid "History you specified is not exists" +msgid "History you specified does not exist" msgstr "История который вы указали, не существует" #: views.py:696 @@ -829,7 +829,7 @@ msgid "Permission error: only group staff can add member" msgstr "Ошибка доступа: только сотрудники группы могут добавлять членов" #: group/error_msg.py:16 group/error_msg.py:22 -msgid "Group not exists" +msgid "Group does not exist" msgstr "Группа не существует" #: group/error_msg.py:17 @@ -1826,7 +1826,7 @@ msgstr "" #: share/views.py:103 #, python-format -msgid "Failed to share to %s，as it does not exists." +msgid "Failed to share to %s，as it does not exist." msgstr "" #: share/views.py:116 diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 9d46216c1e..c6df524954 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -177,7 +177,7 @@ msgid "Duplicated filename" msgstr "已存在同名的文件" #: views.py:574 views.py:1305 views.py:2539 views.py:2667 -msgid "File not exists" +msgid "File does not exist" msgstr "文件不存在" #: views.py:576 @@ -217,11 +217,11 @@ msgid "Invalid arguments" msgstr "非法参数" #: views.py:796 views.py:891 views.py:2368 views.py:2896 -msgid "Library not exists" +msgid "Library does not exist" msgstr "资料库不存在" #: views.py:798 -msgid "History you specified is not exists" +msgid "History you specified does not exist" msgstr "指定的历史记录不存在" #: views.py:800 diff --git a/share/locale/zh_CN/LC_MESSAGES/django.po b/share/locale/zh_CN/LC_MESSAGES/django.po index 9999b91ee9..acbce354a1 100644 --- a/share/locale/zh_CN/LC_MESSAGES/django.po +++ b/share/locale/zh_CN/LC_MESSAGES/django.po @@ -48,7 +48,7 @@ msgstr "共享到 %(group)s 成功， 请前往 共享 #: views.py:109 #, python-format -msgid "Failed to share to %s，as it does not exists." +msgid "Failed to share to %s，as it does not exist." msgstr "共享到 %s 失败，该小组不存在。" #: views.py:125 diff --git a/share/views.py b/share/views.py index f23195a76c..d0f6e4bb00 100644 --- a/share/views.py +++ b/share/views.py @@ -107,7 +107,7 @@ def share_repo(request): messages.add_message(request, messages.INFO, msg) break if not find: - msg = _(u'Failed to share to %s，as it does not exists.') % group_name + msg = _(u'Failed to share to %s，as it does not exist.') % group_name messages.add_message(request, messages.ERROR, msg) else: ''' Share repo to user ''' diff --git a/tools/seahub-admin.py b/tools/seahub-admin.py old mode 100755 new mode 100644 index b25fa1f92c..854a2851c5 --- a/tools/seahub-admin.py +++ b/tools/seahub-admin.py @@ -20,7 +20,7 @@ else: # Test usermgr.db exists usermgr_db = os.path.join(ccnet_dir, 'PeerMgr/usermgr.db') if not os.path.exists(usermgr_db): - print '%s NOT exists. FAILED' % usermgr_db + print '%s DOES NOT exist. FAILED' % usermgr_db sys.exit(1) # Connect db diff --git a/utils/__init__.py b/utils/__init__.py index 82b59c5509..c2d8274b66 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -149,7 +149,7 @@ def check_filename_with_rename(repo_id, parent_dir, filename): latest_commit = get_commits(repo_id, 0, 1)[0] if not latest_commit: return '' - # TODO: what if parrent_dir does not exists? + # TODO: what if parrent_dir does not exist? dirents = seafserv_threaded_rpc.list_dir_by_path(latest_commit.id, parent_dir.encode('utf-8')) diff --git a/views.py b/views.py index 3f080b8233..d5e4ec5ad5 100644 --- a/views.py +++ b/views.py @@ -571,7 +571,7 @@ def upload_error_msg (code): elif (code == 1): err_msg = _(u'Duplicated filename') elif (code == 2): - err_msg = _(u'File not exists') + err_msg = _(u'File does not exist') elif (code == 3): err_msg = _(u'File size surpasses the limit') elif (code == 4): @@ -793,9 +793,9 @@ def repo_history_revert(request, repo_id): if e.msg == 'Bad arguments': return render_error(request, _(u'Invalid arguments')) elif e.msg == 'No such repo': - return render_error(request, _(u'Library not exists')) + return render_error(request, _(u'Library does not exist')) elif e.msg == "Commit doesn't exist": - return render_error(request, _(u'History you specified is not exists')) + return render_error(request, _(u'History you specified does not exist')) else: return render_error(request, _(u'Unknown error')) @@ -888,7 +888,7 @@ def modify_token(request, repo_id): def repo_remove(request, repo_id): repo = get_repo(repo_id) if not repo: - return render_error(request, _(u'Library not exists')) + return render_error(request, _(u'Library does not exist')) user = request.user.username org, base_template = check_and_get_org_by_repo(repo_id, user) @@ -1302,7 +1302,7 @@ def repo_view_file(request, repo_id): obj_id = None if not obj_id: - return render_error(request, _(u'File not exists')) + return render_error(request, _(u'File does not exist')) if repo.encrypted and not is_passwd_set(repo_id, request.user.username): # Redirect uesr to decrypt repo page. @@ -2367,7 +2367,7 @@ def render_file_revisions (request, repo_id): repo = get_repo(repo_id) if not repo: - error_msg = _(u"Library not exists") + error_msg = _(u"Library does not exist") return render_error(request, error_msg) try: @@ -2538,7 +2538,7 @@ def view_shared_file(request, token): obj_id = None if not obj_id: - return render_error(request, _(u'File not exists')) + return render_error(request, _(u'File does not exist')) repo = get_repo(repo_id) if not repo: @@ -2666,7 +2666,7 @@ def view_file_via_shared_dir(request, token): quote_filename = urllib2.quote(file_name.encode('utf-8')) file_id = get_file_id_by_path(repo_id, path) if not file_id: - return render_error(request, _(u'File not exists')) + return render_error(request, _(u'File does not exist')) access_token = seafserv_rpc.web_get_access_token(repo.id, file_id, 'view', '') @@ -2895,7 +2895,7 @@ def repo_star_file(request, repo_id): def repo_download_dir(request, repo_id): repo = get_repo(repo_id) if not repo: - return render_error(request, _(u'Library not exists')) + return render_error(request, _(u'Library does not exist')) path = request.GET.get('p', '/') if path[-1] != '/': # Normalize dir path