diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -354,7 +354,7 @@ class PullrequestsController(BaseRepoCon h.flash(_('Successfully opened new pull request'), category='success') except Exception: - h.flash(_('Error occurred during sending pull request'), + h.flash(_('Error occurred while creating pull request'), category='error') log.error(traceback.format_exc()) return redirect(url('pullrequest_home', repo_name=repo_name)) diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -1431,7 +1431,7 @@ class Repository(Base, BaseModel): log.debug('Cache for %s invalidated, getting new object' % (rn)) region_invalidate(_c, None, rn) else: - log.debug('Getting obj for %s from cache' % (rn)) + log.debug('Getting scm_instance of %s from cache' % (rn)) return _c(rn) def __get_instance(self): @@ -2256,7 +2256,6 @@ class PullRequest(Base, BaseModel): # values for .status STATUS_NEW = u'new' - STATUS_OPEN = u'open' STATUS_CLOSED = u'closed' pull_request_id = Column('pull_request_id', Integer(), nullable=False, primary_key=True) diff --git a/kallithea/model/notification.py b/kallithea/model/notification.py --- a/kallithea/model/notification.py +++ b/kallithea/model/notification.py @@ -150,7 +150,7 @@ class NotificationModel(BaseModel): def get_for_user(self, user, filter_=None): """ - Get mentions for given user, filter them if filter dict is given + Get notifications for given user, filter them if filter dict is given :param user: :param filter: diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -1707,7 +1707,7 @@ function ajaxActionRevokePermission(url, $('#' + field_id).remove(); }, failure: function (o) { - alert(_TM['Failed to remoke permission'] + ": " + o.status); + alert(_TM['Failed to revoke permission'] + ": " + o.status); }, }; query_params = { diff --git a/kallithea/templates/base/root.html b/kallithea/templates/base/root.html --- a/kallithea/templates/base/root.html +++ b/kallithea/templates/base/root.html @@ -53,7 +53,7 @@ 'No matching files': "${_('No matching files')}", 'Open new pull request': "${_('Open new pull request')}", 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}", - 'Show selected changesets __S -> __E': "${_('Show selected changesets __S -> __E')}", + 'Show selected changesets __S → __E': "${h.literal(_('Show selected changesets __S → __E'))}", 'Show selected changeset __S': "${_('Show selected changeset __S')}", 'Selection link': "${_('Selection link')}", 'Collapse diff': "${_('Collapse diff')}", @@ -63,7 +63,7 @@ 'enabled': "${_('enabled')}", 'disabled': "${_('disabled')}", 'Select changeset': "${_('Select changeset')}", - 'specify changeset': "${_('specify changeset')}", + 'Specify changeset': "${_('Specify changeset')}", 'MSG_SORTASC': "${_('Click to sort ascending')}", 'MSG_SORTDESC': "${_('Click to sort descending')}", 'MSG_EMPTY': "${_('No records found.')}", diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html +++ b/kallithea/templates/changelog/changelog.html @@ -46,7 +46,7 @@ ${self.repo_context_bar('changelog')} ${_('Compare fork with Parent(%s)' % c.db_repo.fork.repo_name)} + class="btn btn-mini"> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)} %endif ${_('Open new pull request')} @@ -188,7 +188,7 @@ ${self.repo_context_bar('changelog')} var link = (rev_start == rev_end) ? _TM['Show selected changeset __S'] - : _TM['Show selected changesets __S -> __E']; + : _TM['Show selected changesets __S → __E']; link = link.replace('__S',rev_start.substr(0,6)); link = link.replace('__E',rev_end.substr(0,6)); diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html +++ b/kallithea/templates/changeset/changeset_file_comment.html @@ -65,7 +65,7 @@
${_('Commenting on line {1}.')} ${(_('Comments parsed using %s syntax with %s support.') % ( ('RST' % h.url('rst_help')), - ('@mention' % _('Use @username inside this text to send notification to this Kallithea user')) + ('@mention' % _('Use @username inside this text to notify another user')) ) )|n } diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -115,7 +115,7 @@ ${self.repo_context_bar('changelog')} data.results.push({'text': section, 'children': children}) }); //push the typed in changeset - data.results.push({'text':_TM['specify changeset'], + data.results.push({'text':_TM['Specify changeset'], 'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]}) query.callback(data); }else{ @@ -126,7 +126,7 @@ ${self.repo_context_bar('changelog')} type: 'GET', success: function(data) { cache[key] = data; - query.callback({results: data.results}); + query.callback(data); } }) } @@ -155,7 +155,7 @@ ${self.repo_context_bar('changelog')} data.results.push({'text': section, 'children': children}) }); //push the typed in changeset - data.results.push({'text':_TM['specify changeset'], + data.results.push({'text':_TM['Specify changeset'], 'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]}) query.callback(data); }else{ diff --git a/kallithea/templates/index_base.html b/kallithea/templates/index_base.html --- a/kallithea/templates/index_base.html +++ b/kallithea/templates/index_base.html @@ -174,7 +174,7 @@ //TODO: load here full list later to do search within groups YUD.addClass('q_filter', 'loaded'); } - }); + }); YUE.on('q_filter','keyup',function (e) { clearTimeout(filterTimeout); diff --git a/kallithea/templates/pullrequests/pullrequest.html b/kallithea/templates/pullrequests/pullrequest.html --- a/kallithea/templates/pullrequests/pullrequest.html +++ b/kallithea/templates/pullrequests/pullrequest.html @@ -79,7 +79,7 @@ ${self.repo_context_bar('showpullrequest
- ${h.submit('save',_('Send Pull Request'),class_="btn")} + ${h.submit('save',_('Create Pull Request'),class_="btn")} ${h.reset('reset',_('Reset'),class_="btn")}
diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # -*- coding: utf-8 -*- import os import sys