From: Peter L. <pet...@te...> - 2010-01-08 17:22:24
|
Committed. I checked the po files. All 28 have have: "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n set. /Peter > 2010/1/8 Peter Landgren <pet...@te...>: > > So I should commit: > > > > src/TransUtils.py > > src/BasicUtils/_NameDisplay.py > > src/gen/lib/grampstype.py > > as changed by Benny's path > > and > > src/gui/views/treemodels/peoplemodel.py > > yes, and then be on the lookout for issues in reports and such, as > some places might have issues that unicode is now there instead of > str. > > My main fear is that some strings in the translation files might have > issues when converted to unicode if the po file was in some strange > encoding. I think we should enforce that po files are written in > Ascii, or in utf-8, and nothing else. But I think that will be the > case at the moment. > > Benny > > > /Peter > > > >> 2010/1/6 Brian Matherly <br...@gr...>: > >> > Benny, > >> > > >> >> Brian, > >> >> > >> >> there one issue in this patch: > >> >> > >> >> --- src/gen/lib/grampstype.py (revision > >> >> 13976) > >> >> +++ src/gen/lib/grampstype.py (working > >> >> copy) > >> >> @@ -30,7 +30,7 @@ > >> >> # Python modules > >> >> # > >> >> > >> >> #-------------------------------------------------------------------- > >> >>--- - -from gettext import gettext as _ > >> >> +from TransUtils import gettext as _ > >> >> _UNKNOWN = _('Unknown') > >> >> > >> >> > >> >> This is a mixing outside of src/gen. > >> >> Where would you move TransUtils? > >> >> Alternative is to write in gen.lib instead of > >> >> > >> >> from gettext import gettext as _ > >> >> > >> >> do > >> >> > >> >> from gettext import gettext > >> >> def _(msgid): > >> >> return unicode(gettext(msgid)) > >> >> > >> >> But doing that in one place, TransUtils, is to be preferred > >> >> I think. > >> >> > >> >> Benny > >> >> > >> >> 2010/1/5 Benny Malengier <ben...@gm...>: > >> >> > Peter, > >> >> > > >> >> > attachment patch makes sure using TransUtils always > >> >> > >> >> returns unicode, > >> >> > >> >> > so the conversion must not be written later on in > >> >> > >> >> every module. > >> >> > >> >> > For this, we only need at the top: > >> >> > > >> >> > from TransUtils import gettext as _ > >> >> > > >> >> > Could you try this, add in the models the import from > >> >> > >> >> TransUtils, and > >> >> > >> >> > remove the extra unicode call in the models of > >> >> > >> >> translated strings, as > >> >> > >> >> > TransUtils always returns a unicode object now? > >> >> > > >> >> > Doing it like this might be usefull, as python 3.0 is > >> >> > >> >> all unicode, so > >> >> > >> >> > ugettext in the translation class is no longer > >> >> > >> >> present. > >> >> > >> >> > Benny > >> > > >> > Thanks for being sensitive to the GEP008 effort! > >> > > >> > We actually already do this in date.py. So it isn't much of a > >> > deviation. My plan is for TransUtils.py to be moved into src/gen. But > >> > it will probably be renamed and some parts may be moved out. > >> > > >> > For now, I'm ok with using TransUtils in this situation. > >> > > >> > However, I think it would be easier to just change: > >> > from gettext import gettext as _ > >> > to: > >> > from gettext import ugettext as _ > >> > > >> > What I like about that is that when we switch to support Python 3, it > >> > is easy to "find and replace" to put all ugettext back to gettext. > >> > However, if you use TransUtils, it will probably remain residual long > >> > after we have switched to Python 3. > >> > >> As I understood the documentation, ugettext is only available in the > >> class based gettext api, not in the default functions we are using in > >> Gramps. > >> See http://docs.python.org/library/gettext.html > >> So using ugettext means doing translation differently, which you have > >> some experience with, that is why I wrote earlier in this thread: > >> "Perhaps if Brian has full understanding of the class based translation > >> api, we can change to that completely" :-) > >> > >> I would have to do some study to change our translation to that, but I > >> think the present system still has some translation issues in glade > >> (as Peter is already complaining about for a long time) which are not > >> fixed (first I have other irons in the fire) > >> > >> Benny > >> > >> > I'm OK with either way you go. > >> > > >> > ~Brian |