Mercurial > hg > savane-forge
changeset 283:4006e8d335f6
i18n fixes
| author | Sylvain Beucler <beuc@beuc.net> |
|---|---|
| date | Sat, 14 Aug 2010 10:17:41 +0200 |
| parents | 78c89f6ed764 |
| children | 4f5a9c142185 |
| files | migrate_old_savane.sql savane/svpeople/forms.py savane/svpeople/views.py |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/migrate_old_savane.sql +++ b/migrate_old_savane.sql @@ -415,6 +415,12 @@ (id, label, active) SELECT category_id, name, '1' FROM savane_old.people_job_category; +# Decapitalize, used in translations +UPDATE svpeople_category SET label='Project manager' WHERE label='Project Manager'; +UPDATE svpeople_category SET label='Unix admin' WHERE label='Unix Admin'; +UPDATE svpeople_category SET label='Doc writer' WHERE label='Doc Writer'; +UPDATE svpeople_category SET label='Support manager' WHERE label='Support Manager'; +UPDATE svpeople_category SET label='Graphic/other designer' WHERE label='Graphic/Other Designer'; TRUNCATE svpeople_skill; -- id <- skill_id
--- a/savane/svpeople/forms.py +++ b/savane/svpeople/forms.py @@ -30,5 +30,5 @@ def __init__(self, *args, **kwargs): super(self.__class__, self).__init__(*args, **kwargs) # Translate categories from database - self.base_fields['category'].choices = \ - [ (k,ugettext(v)) for k,v in self.base_fields['category'].choices ] + self.fields['category'].choices = \ + [ (k,ugettext(v)) for k,v in self.fields['category'].choices ]
--- a/savane/svpeople/views.py +++ b/savane/svpeople/views.py @@ -139,6 +139,7 @@ form = form_class(instance=object) # An unbound form # Skills + # TODO: translate skill_year and skill_level from django.forms.models import inlineformset_factory JobInventoryFormSet = inlineformset_factory(svpeople_models.Job, svpeople_models.JobInventory) if request.method == "POST":