← Back to branch summary

~rosco2/ubuntu/wily/gramps/bug-1492304

« back to all changes in this revision

Viewing changes to gramps/plugins/rel/rel_es.py

  • Committer: Package Import Robot
  • Author(s): Ross Gammon
  • Date: 2015-08-11 23:03:11 UTC
  • mfrom: (1.4.3)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20150811230311-acjr8gcfe8isx7ij
https://launchpad.net/bugs/1464845
https://launchpad.net/bugs/1451259
* New upstream release
* Drop patches applied upstream or cherry-picked from there
* Add version constraints for gtk and pygobject
* Add goocanvas dependency - available soon
* Drop webkit dpendency as HTML view has been removed
* Force removal of upstream packages when installing Debian one
  (LP: #1464845)
* Drop fixperm override as permissions fixed upstream
* Fix spelling error in changelog
* Switch to nose for unit tests
* Add build dependencies for the nose tests
* Update copyright file
* Add uversionmangle to watch file to deal with alpha/beta versions
* Add manual test cases
* Drop FAQ URL from upstream metadata - changes every release
* Add patch to fix transparent windows in Ubuntu.
  Thanks to Lance Orner (LP: #1451259)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gramps/plugins/rel/rel_es.py
24
24
"""
25
25
Spanish-specific classes for relationships.
26
26
"""
27
 
from __future__ import unicode_literals
 
27
 
28
28
#-------------------------------------------------------------------------
29
29
#
30
30
# GRAMPS modules
357
357
        else:
358
358
            return "%d-ésima tía abuela%s" % (level-2, inlaw)
359
359
 
360
 
    def _get_distant_aunt(self, level, step, inlae):
 
360
    def _get_distant_aunt(self, level, step, inlaw):
361
361
        if step:
362
362
            base = 'tiastra'
363
363
        else: