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

Fix typo #78

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d79ba00
ungettext doesn't work with undefined vars, need to set default value
Krokop Dec 6, 2017
cb39148
Merge pull request #1 from Krokop/fix_internationalization
Krokop Dec 11, 2017
f14848f
add translations (#2)
Krokop Mar 23, 2018
181889e
add translations
odb-nodered Mar 26, 2018
f8c89f0
add translations
odb-nodered Mar 26, 2018
e1f18fb
change translations
odb-nodered Mar 27, 2018
22b0450
Update ckanext-issues.po
MaryNamj Mar 27, 2018
18e7e6e
Style and minor layout changes to fit into main design paradigm
deepnavy Mar 28, 2018
0fe5204
Merge pull request #3 from 908Inc/design-changes-matching-dgua
deepnavy Mar 29, 2018
a007104
Change buttons design and position in comment moderation
deepnavy Mar 29, 2018
4ef058f
Merge pull request #4 from 908Inc/change-moderation-design-fix-typo
deepnavy Mar 29, 2018
8fc6066
Changed datetime.now on datetime.utcnow defauld fields value (#5)
DaleDMT Apr 10, 2018
53b3115
Fixed translation
DaleDMT Apr 13, 2018
5db3fef
Merge pull request #6 from 908Inc/fix-translation
DaleDMT Apr 16, 2018
d45630f
Fix font size of "new issue" button
deepnavy May 11, 2018
fd5a05c
Merge pull request #7 from 908Inc/fix-font-size-new-issue
deepnavy May 11, 2018
e709659
Fix email templates
DaleDMT May 14, 2018
bf5050a
Merge branch 'master' of ssh://github.com/908Inc/ckanext-issues
DaleDMT May 14, 2018
7f5b509
Merge pull request #8 from 908Inc/fix-email-issues
DaleDMT May 14, 2018
5e1db4c
change translation
odb-nodered May 16, 2018
41baeac
Clean html in templates
DaleDMT May 21, 2018
31eb8f1
Merge pull request #9 from 908Inc/fix-email-issues
DaleDMT May 21, 2018
51fddef
Update translates (#10)
Krokop Jun 6, 2018
9dab719
Fix email
Krokop Jun 12, 2018
4a99dcf
Merge pull request #11 from 908Inc/fix_errors
Krokop Jun 12, 2018
df45ae7
fixed templates, (#12)
Krokop Jun 12, 2018
3689e4b
fix translates (#13)
Krokop Jun 12, 2018
cebfaaa
fix letter
ivankin Jun 21, 2018
b1bb2de
fix letter
ivankin Jun 21, 2018
75aecfe
unicode in flash messages
DaleDMT Jun 25, 2018
df40414
fixed new comment notification logic for sending notification to issu…
DaleDMT Jun 25, 2018
50e0155
Merge pull request #14 from 908Inc/fix-assign-form-error
DaleDMT Jun 26, 2018
4b2331c
Merge pull request #15 from 908Inc/comment-notification
DaleDMT Jun 26, 2018
2ec0822
Hide button close for issue owner + update translations (#16)
Krokop Jul 2, 2018
3bb450f
fixed flash messages
DaleDMT Jul 2, 2018
798392c
Merge pull request #17 from 908Inc/user-not-exist-translation
DaleDMT Jul 2, 2018
301b21a
updated translates (#18)
Krokop Jul 2, 2018
cc9fbf0
changed notification message, added translates (#19)
Krokop Jul 3, 2018
83ad78e
Fix translates (#20)
Krokop Jul 3, 2018
c1c3e4f
removes extra apostophe, translate
DaleDMT Jul 9, 2018
ff22f66
Merge pull request #21 from 908Inc/fix-new-issue-email
DaleDMT Jul 9, 2018
1bb7e57
fixed emal template, translation
DaleDMT Jul 9, 2018
7d9fd46
Merge pull request #22 from 908Inc/fix-new-issue-tmpl
DaleDMT Jul 9, 2018
5fb25f8
fixed-tanslation
DaleDMT Aug 7, 2018
3b0f09a
Merge pull request #23 from 908Inc/translations
DaleDMT Aug 8, 2018
1dc463e
added issue count
DaleDMT Sep 5, 2018
2b6dde8
Merge pull request #24 from 908Inc/issues-count
DaleDMT Sep 5, 2018
d160aee
fixed link
DaleDMT Sep 5, 2018
71d3316
Merge pull request #25 from 908Inc/fix-issues-link
DaleDMT Sep 5, 2018
e6472ec
hided issue_count if no issues
DaleDMT Sep 10, 2018
6f5a6db
Merge pull request #26 from 908Inc/fix-issue-count
DaleDMT Sep 10, 2018
e8d0a52
fix-extra-close-div
DaleDMT Oct 18, 2018
a3e80d2
Merge pull request #27 from 908Inc/repare-footer
DaleDMT Oct 18, 2018
cd2d6db
fixed typo
DaleDMT Oct 22, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions ckanext/issues/controller/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def new(self, dataset_id, resource_id=None):
})

if not data_dict['title']:
c.error_summary['title'] = ["Please enter a title"]
c.error_summary[_('title')] = [_("Please enter a title")]
c.errors = c.error_summary

if not c.error_summary: # save and redirect
Expand All @@ -128,10 +128,10 @@ def show(self, issue_number, dataset_id):
session=model.Session)
except toolkit.ValidationError, e:
p.toolkit.abort(
404, toolkit._('Issue not found: {0}'.format(e.error_summary)))
404, toolkit._(u'Issue not found: {0}').format(e.error_summary))
except toolkit.ObjectNotFound, e:
p.toolkit.abort(
404, toolkit._('Issue not found: {0}'.format(e)))
404, toolkit._(u'Issue not found: {0}').format(e))
extra_vars['dataset'] = dataset
return p.toolkit.render('issues/show.html', extra_vars=extra_vars)

Expand Down Expand Up @@ -210,7 +210,10 @@ def comments(self, dataset_id, issue_number):
'dataset_id': dataset['id'],
'status': status
}
logic.get_action('issue_update')(self.context, issue_dict)
try:
logic.get_action('issue_update')(self.context, issue_dict)
except p.toolkit.NotAuthorized as e:
p.toolkit.abort(401, e.message)
if 'close' in request.POST:
h.flash_success(_("Issue closed"))
else:
Expand Down Expand Up @@ -252,13 +255,11 @@ def delete(self, dataset_id, issue_number):
'dataset_id': dataset_id}
)
except toolkit.NotAuthorized:
msg = _('Unauthorized to delete issue {0}'.format(
issue_number))
msg = _(u'Unauthorized to delete issue {0}').format(
issue_number)
toolkit.abort(401, msg)

h.flash_notice(
_('Issue {0} has been deleted.'.format(issue_number))
)
h.flash_notice(_(u'Issue has been deleted.'))
p.toolkit.redirect_to('issues_dataset', dataset_id=dataset_id)
else:
return render('issues/confirm_delete.html',
Expand All @@ -275,7 +276,7 @@ def assign(self, dataset_id, issue_number):
assignee = toolkit.get_action('user_show')(
data_dict={'id': assignee_id})
except toolkit.ObjectNotFound:
h.flash_error(_('User {0} does not exist'.format(assignee_id)))
h.flash_error(_(u'User {0} does not exist').format(assignee_id))
return p.toolkit.redirect_to('issues_show',
issue_number=issue_number,
dataset_id=dataset_id)
Expand All @@ -295,8 +296,8 @@ def assign(self, dataset_id, issue_number):

if notifications:
subject = get_issue_subject(issue)
body = toolkit._('Assigned to {user}'.format(
user=assignee['display_name']))
msg = toolkit._("Assigned to %s")
body = msg % assignee['display_name']

user_obj = model.User.get(assignee_id)
try:
Expand All @@ -305,8 +306,7 @@ def assign(self, dataset_id, issue_number):
log.debug(e.message)

except toolkit.NotAuthorized:
msg = _('Unauthorized to assign users to issue'.format(
issue_number))
msg = _(u'Unauthorized to assign users to issue')
toolkit.abort(401, msg)
except toolkit.ValidationError, e:
toolkit.abort(404)
Expand Down Expand Up @@ -404,9 +404,7 @@ def report_clear(self, dataset_id, issue_number):
dataset_id=dataset_id,
issue_number=issue_number)
except toolkit.NotAuthorized:
msg = _('You must be logged in clear abuse reports').format(
issue_number
)
msg = _(u'You must be logged in clear abuse reports')
toolkit.abort(401, msg)
except toolkit.ValidationError:
toolkit.abort(404)
Expand All @@ -427,9 +425,7 @@ def comment_report_clear(self, dataset_id, issue_number, comment_id):
dataset_id=dataset_id,
issue_number=issue_number)
except toolkit.NotAuthorized:
msg = _('You must be logged in to clear abuse reports').format(
issue_number
)
msg = _(u'You must be logged in to clear abuse reports')
toolkit.abort(401, msg)
except toolkit.ValidationError:
toolkit.abort(404)
Expand All @@ -444,8 +440,8 @@ def issues_for_organization(self, org_id):
try:
template_params = issues_for_org(org_id, request.GET)
except toolkit.ValidationError, e:
msg = toolkit._("Validation error: {0}".format(e.error_summary))
log.warning(msg + ' - Issues for org: %s', org_id)
msg = toolkit._(u'Validation error: {0}').format(e.error_summary)
log.warning(msg + u' - Issues for org: %s', org_id)
h.flash(msg, category='alert-error')
return p.toolkit.redirect_to('issues_for_organization',
org_id=org_id)
Expand Down Expand Up @@ -484,7 +480,7 @@ def all_issues_page(self):


def _dataset_handle_error(dataset_id, exc):
msg = toolkit._("Validation error: {0}".format(exc.error_summary))
msg = toolkit._(u'Validation error: {0}').format(exc.error_summary)
h.flash(msg, category='alert-error')
return p.toolkit.redirect_to('issues_dataset', dataset_id=dataset_id)

Expand Down
Loading