Skip to content
This repository has been archived by the owner on Nov 19, 2021. It is now read-only.

Commit

Permalink
i18n: pages; missing .mo files
Browse files Browse the repository at this point in the history
  • Loading branch information
nmfm committed Feb 15, 2012
1 parent 614327c commit 99c5037
Show file tree
Hide file tree
Showing 28 changed files with 460 additions and 94 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*.swo
*.pyo
*~
*.mo
/build/
/dist/
/env/
Expand Down
Binary file added sapling/ckeditor/locale/pt_PT/LC_MESSAGES/django.mo
Binary file not shown.
Binary file not shown.
5 changes: 3 additions & 2 deletions sapling/pages/feeds.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _

import recentchanges
from recentchanges import RecentChanges
Expand Down Expand Up @@ -38,7 +39,7 @@ def page(self, obj):
return page

def title(self, obj):
return 'File %s on page "%s"' % (obj.name, self.page(obj).name)
return _('File %(filename)s on page "%(pagename)s"') % {'filename': obj.name, 'pagename': self.page(obj).name})

def diff_url(self, obj):
return reverse('pages:file-compare-dates', kwargs={
Expand Down Expand Up @@ -75,5 +76,5 @@ def get_object(self, request, slug='', file=''):
obj = PageFile(slug=slugify(slug), name=file)
page = Page(slug=slugify(slug))
obj.page = page.versions.most_recent()
obj.title = 'File %s on page "%s"' % (obj.name, obj.page.name)
obj.title = _('File %(filename)=s on page "%(pagename)s"') % {'filename': obj.name, 'pagename': obj.pageobj.name}
return obj
3 changes: 2 additions & 1 deletion sapling/pages/fields.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django import forms
from django.utils.translation import ugettext_lazy as _

from .models import Page, slugify

Expand All @@ -18,7 +19,7 @@ def clean(self, value):
return self.queryset.filter(slug=slugify(value)).get()
except self.queryset.model.DoesNotExist:
raise forms.ValidationError(
"Page %s does not exist! Please enter a valid page name." % (
_("Page %s does not exist! Please enter a valid page name.") % (
self.queryset.model._meta.verbose_name,))

def prepare_value(self, value):
Expand Down
7 changes: 4 additions & 3 deletions sapling/pages/forms.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import mimetypes

from django import forms
from django.utils.translation import ugettext_lazy as _

from versionutils.merging.forms import MergeMixin
from versionutils.versioning.forms import CommentMixin
Expand All @@ -10,7 +11,7 @@


class PageForm(MergeMixin, CommentMixin, forms.ModelForm):
conflict_error = (
conflict_error = _(
"Warning: someone else saved this page before you. "
"Please resolve edit conflicts and save again."
)
Expand Down Expand Up @@ -42,7 +43,7 @@ def clean_name(self):
page = Page.objects.get(slug__exact=slugify(name))
if self.instance != page:
raise forms.ValidationError(
'A page with this name already exists'
_('A page with this name already exists')
)
except Page.DoesNotExist:
pass
Expand All @@ -58,7 +59,7 @@ def clean(self):
(mime_type, enc) = mimetypes.guess_type(filename)
if mime_type != self.instance.mime_type:
raise forms.ValidationError(
'The new file should be of the same type')
_('The new file should be of the same type'))
return self.cleaned_data

class Meta:
Expand Down
Binary file added sapling/pages/locale/pt_PT/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit 99c5037

Please sign in to comment.