kallithea Changeset - bf011c9f7f58

Changeset - bf011c9f7f58

Parent rev.

Child rev.

[Not reviewed]

default

0 11 0

Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com

minor fixes - mainly wording

11 files changed with 15 insertions and 15 deletions:

kallithea/controllers/pullrequests.py

kallithea/model/db.py

kallithea/model/notification.py

kallithea/public/js/base.js

kallithea/templates/base/root.html

kallithea/templates/changelog/changelog.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/index_base.html

kallithea/templates/pullrequests/pullrequest.html

setup.py

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -351,13 +351,13 @@ class PullrequestsController(BaseRepoCon @@
                 other_ref, revisions, reviewers, title, description
+            )
             Session().commit()
             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))
         return redirect(url('pullrequest_show', repo_name=other_repo,
                             pull_request_id=pull_request.pull_request_id))

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1428,13 +1428,13 @@ class Repository(Base, BaseModel): @@
         valid = CacheInvalidation.test_and_set_valid(rn, None, valid_cache_keys=valid_cache_keys)
         if not valid:
             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):
         repo_full_path = self.repo_full_path
         try:
             alias = get_scm(repo_full_path)[0]
@@ @@ -2253,13 +2253,12 @@ class PullRequest(Base, BaseModel): @@
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
     # 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)
     title = Column('title', Unicode(256), nullable=True)
     description = Column('description', UnicodeText(10240), nullable=True)
     status = Column('status', Unicode(256), nullable=False, default=STATUS_NEW) # only for closedness, not approve/reject/etc

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -147,13 +147,13 @@ class NotificationModel(BaseModel): @@
         except Exception:
             log.error(traceback.format_exc())
             raise
     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:
         """
         user = self._get_user(user)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1704,13 +1704,13 @@ var addPermAction = function(_html, user @@
 function ajaxActionRevokePermission(url, obj_id, obj_type, field_id, extra_data) {
     var callback = {
         success: function (o) {
             $('#' + field_id).remove();
         },
         failure: function (o) {
-            alert(_TM['Failed to remoke permission'] + ": " + o.status);
+            alert(_TM['Failed to revoke permission'] + ": " + o.status);
         },
     };
     query_params = {
         '_method': 'delete'
+    }
     // put extra data into POST

kallithea/templates/base/root.html

➞

Show inline comments

@@ @@ -50,23 +50,23 @@ @@
                 'Loading ...':"${_('Loading ...')}",
                 'loading ...':"${_('loading ...')}",
                 'Search truncated': "${_('Search truncated')}",
                 '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')}",
                 'Expand diff': "${_('Expand diff')}",
                 'Failed to revoke permission': "${_('Failed to revoke permission')}",
                 'Confirm to revoke permission for {0}: {1} ?': "${_('confirm to revoke permission for {0}: {1} ?')}",
                 '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.')}",
                 'MSG_ERROR': "${_('Data error.')}",
                 'MSG_LOADING': "${_('Loading...')}",

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -43,13 +43,13 @@ ${self.repo_context_bar('changelog')} @@
                             <a href="#" class="btn btn-mini" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                             %if c.db_repo.fork:
                                 <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>
                        ${h.form(h.url.current(),method='get')}
                        <div style="float:left">
@@ @@ -185,13 +185,13 @@ ${self.repo_context_bar('changelog')} @@
                         var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                         var url = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}',
                                                                   'revision': rev_start+'...'+rev_end});
                         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));
                         YUD.get('rev_range_container').href = url;
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -62,13 +62,13 @@ @@
   %if c.authuser.username != 'default':
       ${h.form('#', class_='inline-form')}
       <div id="edit-container_{1}" class="clearfix">
           <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
+           }
           <div id="preview-btn_{1}" class="preview-btn btn btn-mini">${_('Preview')}</div>
           </div>
             <div class="mentions-container" id="mentions_container_{1}"></div>

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -112,24 +112,24 @@ ${self.repo_context_bar('changelog')} @@
                         children.push({'id': this.id, 'text': this.text})
+                    }
                 })
                 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{
               $.ajax({
                 url: pyroutes.url('repo_refs_data', {'repo_name': '${c.org_repo.repo_name}'}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
-                  query.callback({results: data.results});
                   query.callback(data);
+                }
               })
+          }
         },
     });
     $("#compare_other").select2({
@@ @@ -152,13 +152,13 @@ ${self.repo_context_bar('changelog')} @@
                         children.push({'id': this.id, 'text': this.text})
+                    }
                 })
                 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{
               $.ajax({
                 url: pyroutes.url('repo_refs_data', {'repo_name': '${c.other_repo.repo_name}'}),
                 data: {},

kallithea/templates/index_base.html

➞

Show inline comments

@@ @@ -171,13 +171,13 @@ @@
         };
         YUE.on('q_filter','click',function(){
             if(!YUD.hasClass('q_filter', 'loaded')){
                 //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);
             filterTimeout = setTimeout(updateFilter,600);
         });

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -76,13 +76,13 @@ ${self.repo_context_bar('showpullrequest @@
                     <div style="clear:both"></div>
                 </div>
             </div>
             <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>
         </div>

setup.py

➞

Show inline comments

 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 import os
 import sys
 import platform
 if sys.version_info < (2, 5):

0 comments (0 inline, 0 general)