Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nursix/eden
Browse files Browse the repository at this point in the history
  • Loading branch information
@nursix
nursix committed Jan 29, 2021
2 parents ce4c004 + 65f5e39 commit b642ee7
Show file tree
Hide file tree
Showing 163 changed files with 262 additions and 185 deletions.
3 changes: 3 additions & 0 deletions languages/de.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2600,6 +2600,8 @@
'Isle of Man': 'Insel Man',
'Issued On': 'Ausgestellt am',
'Issued##fin': 'Ausgestellt',
'Issuer Type': 'Aussteller-Typ',
'Issuer##fin': 'Aussteller',
'Issuers##fin': 'Aussteller',
'Issuing Authority': 'Ausstellende Behörde',
'It captures not only the places where they are active, but also captures information on the range of projects they are providing in each area.': 'Es erfasst nicht nur die Orte wo sie aktiv sind, sondern erfasst auch Informationen über den Umfang der Projekte die sie im jeweiligen Gebiet durchführen.',
Expand Down Expand Up @@ -3589,6 +3591,7 @@
'Number of Tests': 'Anzahl Tests',
'Number of Tugboats': 'Zahl der Schleppkähne',
'Number of Volunteers': 'Anzahl Freiwillige',
'Number of Vouchers': 'Anzahl Gutscheine',
'Number of additional beds of that type expected to become available in this unit within the next 24 hours.': 'Anzahl von zusätzlichen Betten dieses Typs, die voraussichtlich in den nächsten 24 Stunden in dieser Einheit zur Verfügung stehen werden.',
'Number of alternative places for studying': 'Anzahl von alternativen Orten zum studieren.',
'Number of available/vacant beds of that type in this unit at the time of reporting.': 'Anzahl von verfügbaren/freien Betten dieses Typs in dieser Einheit zum Zeitpunkt des Berichtes.',
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@requires: U{B{I{gluon}} <http://web2py.com>}
@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/codecs/card.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
S3Codec to produce printable data cards (e.g. ID cards)
@copyright: 2018-2020 (c) Sahana Software Foundation
@copyright: 2018-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/codecs/pdf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
S3 Adobe PDF codec
@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/codecs/shp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
S3 Shapefile codec
@copyright: 2013-2020 (c) Sahana Software Foundation
@copyright: 2013-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/codecs/svg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
S3 SVG codec
@copyright: 2013-2020 (c) Sahana Software Foundation
@copyright: 2013-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/codecs/xls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
S3 Microsoft Excel codec
@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
5 changes: 3 additions & 2 deletions modules/s3/s3aaa.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@requires: U{B{I{gluon}} <http://web2py.com>}
@copyright: (c) 2010-2020 Sahana Software Foundation
@copyright: (c) 2010-2021 Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down Expand Up @@ -1288,7 +1288,8 @@ def consent(self):

# Remind the user that form should be submitted even if they didn't
# enter anything:
response.s3.jquery_ready.append('''S3SetNavigateAwayConfirm();''')
response.s3.jquery_ready.append('''S3SetNavigateAwayConfirm();
$('form.auth_consent').submit(S3ClearNavigateAwayConfirm);''')

return form

Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3anonymize.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Person Record Anonymizing
@copyright: 2018-2020 (c) Sahana Software Foundation
@copyright: 2018-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3codec.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Encoder/Decoder Base Class
@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3crud.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@requires: U{B{I{gluon}} <http://web2py.com>}
@requires: U{B{I{lxml}} <http://codespeak.net/lxml>}
@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3dashboard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" Dashboards
@copyright: 2016-2020 (c) Sahana Software Foundation
@copyright: 2016-2021 (c) Sahana Software Foundation
@license: MIT
@requires: U{B{I{gluon}} <http://web2py.com>}
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Data Views
@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3datetime.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Date/Time Toolkit
@copyright: 2015-2020 (c) Sahana Software Foundation
@copyright: 2015-2021 (c) Sahana Software Foundation
@license: MIT
@requires: U{B{I{gluon}} <http://web2py.com>}
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3delete.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Record Deletion
@copyright: 2018-2020 (c) Sahana Software Foundation
@copyright: 2018-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3error.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Exceptions and Error Handlers
@copyright: 2012-2020 (c) Sahana Software Foundation
@copyright: 2012-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3export.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@requires: U{B{I{gluon}} <http://web2py.com>}
@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3fields.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@requires: U{B{I{gluon}} <http://web2py.com>}
@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT
Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3filter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" Framework for filtered REST requests
@copyright: 2013-2020 (c) Sahana Software Foundation
@copyright: 2013-2021 (c) Sahana Software Foundation
@license: MIT
@requires: U{B{I{gluon}} <http://web2py.com>}
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 SQL Forms

@copyright: 2012-2020 (c) Sahana Software Foundation
@copyright: 2012-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3gis.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@requires: U{B{I{gluon}} <http://web2py.com>}
@requires: U{B{I{shapely}} <http://trac.gispython.org/lab/wiki/Shapely>}

@copyright: (c) 2010-2020 Sahana Software Foundation
@copyright: (c) 2010-2021 Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3grouped.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Grouped Items Report Method

@copyright: 2015-2020 (c) Sahana Software Foundation
@copyright: 2015-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3hierarchy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Hierarchy Toolkit

@copyright: 2013-2020 (c) Sahana Software Foundation
@copyright: 2013-2021 (c) Sahana Software Foundation
@license: MIT

@requires: U{B{I{gluon}} <http://web2py.com>}
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3import.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" Resource Import Tools

@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3masterkey.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@requires: U{B{I{gluon}} <http://web2py.com>}

@copyright: (c) 2010-2020 Sahana Software Foundation
@copyright: (c) 2010-2021 Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3merge.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@requires: U{B{I{gluon}} <http://web2py.com>}

@copyright: 2012-2020 (c) Sahana Software Foundation
@copyright: 2012-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3mobile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Mobile Forms API

@copyright: 2016-2020 (c) Sahana Software Foundation
@copyright: 2016-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Data Model Extensions

@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3msg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Messages get sent to the Outbox (& Log)
From there, the Scheduler tasks collect them & send them

@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3navigation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Navigation Module

@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3notify.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Notifications

@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3organizer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Organizer (Calendar-based CRUD)

@copyright: 2018-2020 (c) Sahana Software Foundation
@copyright: 2018-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3parser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
This file parses messages using functions defined in in the template's
parser.py

@copyright: 2012-2020 (c) Sahana Software Foundation
@copyright: 2012-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3payments/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" Online Payment Services Integration

@copyright: (c) 2020-2020 Sahana Software Foundation
@copyright: (c) 2020-2021 Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3payments/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" Online Payment Services Integration

@copyright: (c) 2020-2020 Sahana Software Foundation
@copyright: (c) 2020-2021 Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3payments/paypal.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" PayPal API Adapter

@copyright: (c) 2020-2020 Sahana Software Foundation
@copyright: (c) 2020-2021 Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3pdf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
process being removed at a later stage.
######################################################################

@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3profile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Profile

@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3query.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Query Construction

@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3report.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Pivot Table Reports Method

@copyright: 2011-2020 (c) Sahana Software Foundation
@copyright: 2011-2021 (c) Sahana Software Foundation
@license: MIT

@requires: U{B{I{Python 2.6}} <http://www.python.org>}
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3resource.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 Resources

@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
2 changes: 1 addition & 1 deletion modules/s3/s3rest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" S3 RESTful API

@copyright: 2009-2020 (c) Sahana Software Foundation
@copyright: 2009-2021 (c) Sahana Software Foundation
@license: MIT

Permission is hereby granted, free of charge, to any person
Expand Down
Loading

0 comments on commit b642ee7

Please sign in to comment.