From b6aa7c847234ed985ec693c53633a7f0f3e2cd9c Mon Sep 17 00:00:00 2001 From: Mike Chen Date: Wed, 29 Jul 2009 00:01:16 +0800 Subject: merge Evgeny's English and Botum's Spanish translations --- forum/views.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'forum/views.py') diff --git a/forum/views.py b/forum/views.py index 8252304e..08a0e958 100644 --- a/forum/views.py +++ b/forum/views.py @@ -15,6 +15,7 @@ from django.utils import simplejson from django.core import serializers from django.db import transaction from django.contrib.contenttypes.models import ContentType +from django.utils.translation import ugettext as _ from utils.html import sanitize_html from markdown2 import Markdown @@ -1722,13 +1723,13 @@ def upload(request): result = xml_template % ('Good', '', default_storage.url(new_file_name)) except UploadPermissionNotAuthorized: - result = xml_template % ('', u"上传图片只限于积分+60以上注册用户!", '') + result = xml_template % ('', _('uploading images is limited to users with >60 reputation points'), '') except FileTypeNotAllow: - result = xml_template % ('', u"只允许上传'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'类型的文件！", '') + result = xml_template % ('', _("allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"), '') except FileSizeNotAllow: - result = xml_template % ('', u"只允许上传%sK大小的文件！" % settings.ALLOW_MAX_FILE_SIZE / 1024, '') - except Exception: - result = xml_template % ('', u"在文件上传过程中产生了错误，请联系管理员，谢谢^_^", '') + result = xml_template % ('', _("maximum upload file size is %sK") % settings.ALLOW_MAX_FILE_SIZE / 1024, '') + except Exception as e: + result = xml_template % ('', _('Error uploading file. Please contact the site administrator. Thank you. %s' % e), '') return HttpResponse(result, mimetype="application/xml") -- cgit v1.2.3-1-g7c22 From 30202c88eadc4d64a9bac00d7c241d2d20158d82 Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Wed, 29 Jul 2009 16:14:25 -0600 Subject: fixing the little bug --- forum/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'forum/views.py') diff --git a/forum/views.py b/forum/views.py index 08a0e958..8a2ba812 100644 --- a/forum/views.py +++ b/forum/views.py @@ -115,7 +115,11 @@ def questions(request, tagname=None, unanswered=False): # Set flag to False by default. If it is equal to True, then need to be saved. pagesize_changed = False # get pagesize from session, if failed then get default value - pagesize = request.session.get("pagesize") + #ERROR: this does not do what it wants ^^ + #pagesize = request.session.get("pagesize") + #HACK: temporal hack + pagesize = int(request.GET.get("pagesize", QUESTIONS_PAGE_SIZE)) + try: page = int(request.GET.get('page', '1')) except ValueError: -- cgit v1.2.3-1-g7c22 From ebd48ade203736b375d482940498e375cdb32c15 Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Thu, 30 Jul 2009 12:02:54 -0600 Subject: Revert "fixing the little bug" There was no bug just a missing __init__.py file This reverts commit 30202c88eadc4d64a9bac00d7c241d2d20158d82. --- forum/views.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'forum/views.py') diff --git a/forum/views.py b/forum/views.py index 8a2ba812..08a0e958 100644 --- a/forum/views.py +++ b/forum/views.py @@ -115,11 +115,7 @@ def questions(request, tagname=None, unanswered=False): # Set flag to False by default. If it is equal to True, then need to be saved. pagesize_changed = False # get pagesize from session, if failed then get default value - #ERROR: this does not do what it wants ^^ - #pagesize = request.session.get("pagesize") - #HACK: temporal hack - pagesize = int(request.GET.get("pagesize", QUESTIONS_PAGE_SIZE)) - + pagesize = request.session.get("pagesize") try: page = int(request.GET.get('page', '1')) except ValueError: -- cgit v1.2.3-1-g7c22