# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1386700237 -3600
# Node ID bf011c9f7f587c2e459cd62636714f206b21f58e
# Parent  0b4d9ef62be5a2e0c30565b7324cfc5874dd78f4
minor fixes - mainly wording

diff -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/controllers/pullrequests.py
--- a/kallithea/controllers/pullrequests.py	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/controllers/pullrequests.py	Tue Dec 10 19:30:37 2013 +0100
@@ -354,7 +354,7 @@
             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 -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/model/db.py
--- a/kallithea/model/db.py	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/model/db.py	Tue Dec 10 19:30:37 2013 +0100
@@ -1431,7 +1431,7 @@
             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 @@
 
     # 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 -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/model/notification.py
--- a/kallithea/model/notification.py	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/model/notification.py	Tue Dec 10 19:30:37 2013 +0100
@@ -150,7 +150,7 @@
 
     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 -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/public/js/base.js
--- a/kallithea/public/js/base.js	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/public/js/base.js	Tue Dec 10 19:30:37 2013 +0100
@@ -1707,7 +1707,7 @@
             $('#' + 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 -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/templates/base/root.html
--- a/kallithea/templates/base/root.html	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/templates/base/root.html	Tue Dec 10 19:30:37 2013 +0100
@@ -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 &rarr; __E': "${h.literal(_('Show selected changesets __S &rarr; __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 -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/templates/changelog/changelog.html	Tue Dec 10 19:30:37 2013 +0100
@@ -46,7 +46,7 @@
                                 <a id="compare_fork"
                                    title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
                                    href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
-                                   class="btn btn-mini"><i class="icon-loop"></i> ${_('Compare fork with Parent(%s)' % c.db_repo.fork.repo_name)}</a>
+                                   class="btn btn-mini"><i class="icon-loop"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>
                             %endif
                             <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="btn btn-mini">${_('Open new pull request')}</a>
                        </div>
@@ -188,7 +188,7 @@
 
                         var link = (rev_start == rev_end)
                             ? _TM['Show selected changeset __S']
-                            : _TM['Show selected changesets __S -> __E'];
+                            : _TM['Show selected changesets __S &rarr; __E'];
 
                         link = link.replace('__S',rev_start.substr(0,6));
                         link = link.replace('__E',rev_end.substr(0,6));
diff -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/templates/changeset/changeset_file_comment.html
--- a/kallithea/templates/changeset/changeset_file_comment.html	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/templates/changeset/changeset_file_comment.html	Tue Dec 10 19:30:37 2013 +0100
@@ -65,7 +65,7 @@
           <div class="comment-help">${_('Commenting on line {1}.')}
           ${(_('Comments parsed using %s syntax with %s support.') % (
                  ('<a href="%s">RST</a>' % h.url('rst_help')),
-                   ('<span style="color:#577632" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this Kallithea user'))
+                   ('<span style="color:#577632" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to notify another user'))
                )
             )|n
            }
diff -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/templates/compare/compare_diff.html
--- a/kallithea/templates/compare/compare_diff.html	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/templates/compare/compare_diff.html	Tue Dec 10 19:30:37 2013 +0100
@@ -115,7 +115,7 @@
                 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 @@
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
-                  query.callback({results: data.results});
+                  query.callback(data);
                 }
               })
           }
@@ -155,7 +155,7 @@
                 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 -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/templates/index_base.html
--- a/kallithea/templates/index_base.html	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/templates/index_base.html	Tue Dec 10 19:30:37 2013 +0100
@@ -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 -r 0b4d9ef62be5 -r bf011c9f7f58 kallithea/templates/pullrequests/pullrequest.html
--- a/kallithea/templates/pullrequests/pullrequest.html	Fri Jul 18 17:01:37 2014 +0200
+++ b/kallithea/templates/pullrequests/pullrequest.html	Tue Dec 10 19:30:37 2013 +0100
@@ -79,7 +79,7 @@
 
             <div class="field">
                 <div class="buttons">
-                    ${h.submit('save',_('Send Pull Request'),class_="btn")}
+                    ${h.submit('save',_('Create Pull Request'),class_="btn")}
                     ${h.reset('reset',_('Reset'),class_="btn")}
                </div>
             </div>
diff -r 0b4d9ef62be5 -r bf011c9f7f58 setup.py
--- a/setup.py	Fri Jul 18 17:01:37 2014 +0200
+++ b/setup.py	Tue Dec 10 19:30:37 2013 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 import os
 import sys