release: merge back stable branch into default

docs/release-notes/release-notes-4.2.1.rst

@@ -0,0 +1,14 b''
+|RCE| 4.2.1 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2016-07-04
+
+Fixes
+^^^^^
+
+- ui: fixed empty labels caused by missing translation of JS components
+- login: fixed bad routing URL in comments when user is not logged in.
+- celery: make sure to run tasks in sync mode if connection to celery is lost.

rhodecode/public/js/src/i18n_utils.js

@@ -0,0 +1,36 b''
+// # Copyright (C) 2016-2016  RhodeCode GmbH
+// #
+// # This program is free software: you can redistribute it and/or modify
+// # it under the terms of the GNU Affero General Public License, version 3
+// # (only), as published by the Free Software Foundation.
+// #
+// # This program is distributed in the hope that it will be useful,
+// # but WITHOUT ANY WARRANTY; without even the implied warranty of
+// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// # GNU General Public License for more details.
+// #
+// # You should have received a copy of the GNU Affero General Public License
+// # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// #
+// # This program is dual-licensed. If you wish to learn more about the
+// # RhodeCode Enterprise Edition, including its added features, Support services,
+// # and proprietary license terms, please see https://rhodecode.com/licenses/
+
+i18nLog = Logger.get('i18n');
+
+var _gettext = function (s) {
+    if (_TM.hasOwnProperty(s)) {
+        return _TM[s];
+    }
+    i18nLog.error(
+        'String `' + s + '` was requested but cannot be ' +
+        'found in translation table');
+    return s
+};
+
+var _ngettext = function (singular, plural, n) {
+    if (n === 1) {
+        return _gettext(singular)
+    }
+    return _gettext(plural)
+};

.hgtags

@@ -1,6 +1,7 b''
 1bd3e92b7e2e2d2024152b34bb88dff1db544a71 v4.0.0
 170c5398320ea6cddd50955e88d408794c21d43a v4.0.1
 c3fe200198f5aa34cf2e4066df2881a9cefe3704 v4.1.0
 7fd5c850745e2ea821fb4406af5f4bff9b0a7526 v4.1.1
 41c87da28a179953df86061d817bc35533c66dd2 v4.1.2
 baaf9f5bcea3bae0ef12ae20c8b270482e62abb6 v4.2.0
+32a70c7e56844a825f61df496ee5eaf8c3c4e189 v4.2.1

Gruntfile.js

@@ -1,138 +1,139 b''
 module.exports = function(grunt) {
   grunt.initConfig({
 
     dirs: {
       css: "rhodecode/public/css",
       js: {
         "src": "rhodecode/public/js/src",
         "dest": "rhodecode/public/js"
       }
     },
 
     concat: {
       dist: {
         src: [
           // Base libraries
           '<%= dirs.js.src %>/jquery-1.11.1.min.js',
           '<%= dirs.js.src %>/logging.js',
           '<%= dirs.js.src %>/bootstrap.js',
           '<%= dirs.js.src %>/mousetrap.js',
           '<%= dirs.js.src %>/moment.js',
           '<%= dirs.js.src %>/appenlight-client-0.4.1.min.js',
+          '<%= dirs.js.src %>/i18n_utils.js',
 
           // Plugins
           '<%= dirs.js.src %>/plugins/jquery.pjax.js',
           '<%= dirs.js.src %>/plugins/jquery.dataTables.js',
           '<%= dirs.js.src %>/plugins/flavoured_checkbox.js',
           '<%= dirs.js.src %>/plugins/jquery.auto-grow-input.js',
           '<%= dirs.js.src %>/plugins/jquery.autocomplete.js',
           '<%= dirs.js.src %>/plugins/jquery.debounce.js',
           '<%= dirs.js.src %>/plugins/jquery.mark.js',
           '<%= dirs.js.src %>/plugins/jquery.timeago.js',
           '<%= dirs.js.src %>/plugins/jquery.timeago-extension.js',
 
           // Select2
           '<%= dirs.js.src %>/select2/select2.js',
 
           // Code-mirror
           '<%= dirs.js.src %>/codemirror/codemirror.js',
           '<%= dirs.js.src %>/codemirror/codemirror_loadmode.js',
           '<%= dirs.js.src %>/codemirror/codemirror_hint.js',
           '<%= dirs.js.src %>/codemirror/codemirror_overlay.js',
           '<%= dirs.js.src %>/codemirror/codemirror_placeholder.js',
           // TODO: mikhail: this is an exception. Since the code mirror modes
           // are loaded "on the fly", we need to keep them in a public folder
           '<%= dirs.js.dest %>/mode/meta.js',
           '<%= dirs.js.dest %>/mode/meta_ext.js',
           '<%= dirs.js.dest %>/rhodecode/i18n/select2/translations.js',
 
           // Rhodecode utilities
           '<%= dirs.js.src %>/rhodecode/utils/array.js',
           '<%= dirs.js.src %>/rhodecode/utils/string.js',
           '<%= dirs.js.src %>/rhodecode/utils/pyroutes.js',
           '<%= dirs.js.src %>/rhodecode/utils/ajax.js',
           '<%= dirs.js.src %>/rhodecode/utils/autocomplete.js',
           '<%= dirs.js.src %>/rhodecode/utils/colorgenerator.js',
           '<%= dirs.js.src %>/rhodecode/utils/ie.js',
           '<%= dirs.js.src %>/rhodecode/utils/os.js',
 
           // Rhodecode widgets
           '<%= dirs.js.src %>/rhodecode/widgets/multiselect.js',
 
           // Rhodecode components
           '<%= dirs.js.src %>/rhodecode/init.js',
           '<%= dirs.js.src %>/rhodecode/codemirror.js',
           '<%= dirs.js.src %>/rhodecode/comments.js',
           '<%= dirs.js.src %>/rhodecode/constants.js',
           '<%= dirs.js.src %>/rhodecode/files.js',
           '<%= dirs.js.src %>/rhodecode/followers.js',
           '<%= dirs.js.src %>/rhodecode/menus.js',
           '<%= dirs.js.src %>/rhodecode/notifications.js',
           '<%= dirs.js.src %>/rhodecode/permissions.js',
           '<%= dirs.js.src %>/rhodecode/pjax.js',
           '<%= dirs.js.src %>/rhodecode/pullrequests.js',
           '<%= dirs.js.src %>/rhodecode/settings.js',
           '<%= dirs.js.src %>/rhodecode/select2_widgets.js',
           '<%= dirs.js.src %>/rhodecode/tooltips.js',
           '<%= dirs.js.src %>/rhodecode/users.js',
           '<%= dirs.js.src %>/rhodecode/appenlight.js',
 
           // Rhodecode main module
           '<%= dirs.js.src %>/rhodecode.js'
         ],
         dest: '<%= dirs.js.dest %>/scripts.js',
         nonull: true
       }
     },
 
     less: {
       development: {
         options: {
           compress: false,
           yuicompress: false,
           optimization: 0
         },
         files: {
           "<%= dirs.css %>/style.css": "<%= dirs.css %>/main.less"
         }
       },
       production: {
         options: {
           compress: true,
           yuicompress: true,
           optimization: 2
         },
         files: {
           "<%= dirs.css %>/style.css": "<%= dirs.css %>/main.less"
         }
       }
     },
 
     watch: {
       less: {
         files: ["<%= dirs.css %>/*.less"],
         tasks: ["less:production"]
       },
       js: {
         files: ["<%= dirs.js.src %>/**/*.js"],
         tasks: ["concat:dist"]
       }
     },
 
     jshint: {
       rhodecode: {
         src: '<%= dirs.js.src %>/rhodecode/**/*.js',
         options: {
           jshintrc: '.jshintrc'
         }
       }
     }
   });
 
   grunt.loadNpmTasks('grunt-contrib-less');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-jshint');
 
   grunt.registerTask('default', ['less:production', 'concat:dist']);
 };

docs/release-notes/release-notes.rst

@@ -1,83 +1,84 b''
 .. _rhodecode-release-notes-ref:
 
 Release Notes
 =============
 
 |RCE| 4.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.2.1.rst
    release-notes-4.2.0.rst
    release-notes-4.1.2.rst
    release-notes-4.1.1.rst
    release-notes-4.1.0.rst
    release-notes-4.0.1.rst
    release-notes-4.0.0.rst
 
 |RCE| 3.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-3.8.4.rst
    release-notes-3.8.3.rst
    release-notes-3.8.2.rst
    release-notes-3.8.1.rst
    release-notes-3.8.0.rst
    release-notes-3.7.1.rst
    release-notes-3.7.0.rst
    release-notes-3.6.1.rst
    release-notes-3.6.0.rst
    release-notes-3.5.2.rst
    release-notes-3.5.1.rst
    release-notes-3.5.0.rst
    release-notes-3.4.1.rst
    release-notes-3.4.0.rst
    release-notes-3.3.4.rst
    release-notes-3.3.3.rst
    release-notes-3.3.2.rst
    release-notes-3.3.1.rst
    release-notes-3.3.0.rst
    release-notes-3.2.3.rst
    release-notes-3.2.2.rst
    release-notes-3.2.1.rst
    release-notes-3.2.0.rst
    release-notes-3.1.1.rst
    release-notes-3.1.0.rst
    release-notes-3.0.2.rst
    release-notes-3.0.1.rst
    release-notes-3.0.0.rst
 
 |RCE| 2.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-2.2.8.rst
    release-notes-2.2.7.rst
    release-notes-2.2.6.rst
    release-notes-2.2.5.rst
    release-notes-2.2.4.rst
    release-notes-2.2.3.rst
    release-notes-2.2.2.rst
    release-notes-2.2.1.rst
    release-notes-2.2.0.rst
    release-notes-2.1.0.rst
    release-notes-2.0.2.rst
    release-notes-2.0.1.rst
    release-notes-2.0.0.rst
 
 |RCE| 1.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-1.7.2.rst
    release-notes-1.7.1.rst
    release-notes-1.7.0.rst
    release-notes-1.6.0.rst

rhodecode/public/js/rhodecode/i18n/select2/translations.js

@@ -1,34 +1,43 b''
 // translate select2 components
 select2Locales = {
    formatLoadMore: function(pageNumber) {
-       return _TM["Loading more results..."];
+       return _gettext("Loading more results...");
    },
    formatSearching: function() {
-       return _TM["Searching..."];
+       return _gettext("Searching...");
    },
    formatNoMatches: function() {
-       return _TM["No matches found"];
+       return _gettext("No matches found");
    },
    formatAjaxError: function(jqXHR, textStatus, errorThrown) {
-       return _TM["Loading failed"];
+       return _gettext("Loading failed");
    },
    formatMatches: function(matches) {
        if (matches === 1) {
-           return _TM["One result is available, press enter to select it."];
+           return _gettext("One result is available, press enter to select it.");
        }
-       return _TM["{0} results are available, use up and down arrow keys to navigate."].format(matches);
+       return _gettext("{0} results are available, use up and down arrow keys to navigate.").format(matches);
    },
    formatInputTooShort: function(input, min) {
        var n = min - input.length;
-       return "Please enter {0} or more character".format(n) + (n === 1 ? "" : "s");
+       if (n === 1) {
+           return _gettext("Please enter {0} or more character").format(n);
+       }
+       return _gettext("Please enter {0} or more characters").format(n);
    },
    formatInputTooLong: function(input, max) {
        var n = input.length - max;
-       return "Please delete {0} character".format(n) + (n === 1 ? "" : "s");
+       if (n === 1) {
+           return _gettext("Please delete {0} character").format(n);
+       }
+       return _gettext("Please delete {0} characters").format(n);
    },
    formatSelectionTooBig: function(limit) {
-       return "You can only select {0} item".format(limit) + (limit === 1 ? "" : "s");
+       if (limit === 1) {
+           return _gettext("You can only select {0} item").format(limit);
+       }
+       return _gettext("You can only select {0} items").format(limit);
    }
 };
 
 $.extend($.fn.select2.defaults, select2Locales);

rhodecode/public/js/src/plugins/jquery.autocomplete.js

@@ -1,936 +1,936 b''
 /**
 *  Ajax Autocomplete for jQuery, version dev
 *  RhodeCode additions
 *  (c) 2014 Tomas Kirda
 *  (c) 2014 Marcin Kuzminski
 *
 *  Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
 *  For details, see the web site: https://github.com/devbridge/jQuery-Autocomplete
 */
 // Expose plugin as an AMD module if AMD loader is present:
 (function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
         define(['jquery'], factory);
     } else if (typeof exports === 'object' && typeof require === 'function') {
         // Browserify
         factory(require('jquery'));
     } else {
         // Browser globals
         factory(jQuery);
     }
 }(function ($) {
     'use strict';
 
     var
         utils = (function () {
             return {
                 escapeRegExChars: function (value) {
                     return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
                 },
                 createNode: function (containerClass) {
                     var div = document.createElement('div');
                     div.className = containerClass;
                     div.style.position = 'absolute';
                     div.style.display = 'none';
                     return div;
                 }
             };
         }()),
 
         keys = {
             ESC: 27,
             TAB: 9,
             RETURN: 13,
             LEFT: 37,
             UP: 38,
             RIGHT: 39,
             DOWN: 40
         };
 
     function Autocomplete(el, options) {
         var noop = function () { },
             that = this,
             defaults = {
                 ajaxSettings: {},
                 autoSelectFirst: false,
                 appendTo: document.body,
                 serviceUrl: null,
                 lookup: null,
                 width: 'auto',
                 minChars: 1,
                 maxHeight: 300,
                 deferRequestBy: 0,
                 params: {},
                 formatResult: Autocomplete.formatResult,
                 lookupFilter: Autocomplete.lookupFilter,
                 delimiter: null,
                 zIndex: 9999,
                 type: 'GET',
                 noCache: false,
                 onSelect: noop,
                 onSearchStart: noop,
                 onSearchComplete: noop,
                 onSearchError: noop,
                 containerClass: 'autocomplete-suggestions',
                 tabDisabled: false,
                 dataType: 'text',
                 currentRequest: null,
                 triggerSelectOnValidInput: false,
                 preventBadQueries: true,
                 paramName: 'query',
                 transformResult: function (response) {
                     return typeof response === 'string' ? $.parseJSON(response) : response;
                 },
                 showNoSuggestionNotice: false,
-                noSuggestionNotice: _TM['No results'],
+                noSuggestionNotice: _gettext('No results'),
                 orientation: 'bottom',
                 forceFixPosition: false,
                 replaceOnArrowKey: true
             };
 
         // Shared variables:
         that.element = el;
         that.el = $(el);
         that.suggestions = [];
         that.badQueries = [];
         that.selectedIndex = -1;
         that.currentValue = that.element.value;
         that.intervalId = 0;
         that.cachedResponse = {};
         that.onChangeInterval = null;
         that.onChange = null;
         that.isLocal = false;
         that.suggestionsContainer = null;
         that.noSuggestionsContainer = null;
         that.options = $.extend({}, defaults, options);
         that.classes = {
             selected: 'autocomplete-selected',
             suggestion: 'autocomplete-suggestion'
         };
         that.hint = null;
         that.hintValue = '';
         that.selection = null;
 
         // Initialize and set options:
         that.initialize();
         that.setOptions(options);
     }
 
     Autocomplete.utils = utils;
 
     $.Autocomplete = Autocomplete;
 
     Autocomplete.formatResult = function (suggestion, currentValue) {
         var pattern = '(' + utils.escapeRegExChars(currentValue) + ')';
         return suggestion.value.replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
     };
     Autocomplete.lookupFilter = function (suggestion, originalQuery, queryLowerCase) {
         return suggestion.value.toLowerCase().indexOf(queryLowerCase) !== -1;
     };
 
     Autocomplete.prototype = {
 
         killerFn: null,
 
         initialize: function () {
             var that = this,
                 suggestionSelector = '.' + that.classes.suggestion,
                 selected = that.classes.selected,
                 options = that.options,
                 container;
 
             // Remove autocomplete attribute to prevent native suggestions:
             that.element.setAttribute('autocomplete', 'off');
 
             that.killerFn = function (e) {
                 if ($(e.target).closest('.' + that.options.containerClass).length === 0) {
                     that.killSuggestions();
                     that.disableKillerFn();
                 }
             };
 
             // html() deals with many types: htmlString or Element or Array or jQuery
             that.noSuggestionsContainer = $('<div class="autocomplete-no-suggestion"></div>')
                                           .html(this.options.noSuggestionNotice).get(0);
 
             that.suggestionsContainer = Autocomplete.utils.createNode(options.containerClass);
 
             container = $(that.suggestionsContainer);
 
             container.appendTo(options.appendTo);
 
             // Only set width if it was provided:
             if (options.width !== 'auto') {
                 container.width(options.width);
             }
 
             // Listen for mouse over event on suggestions list:
             container.on('mouseover.autocomplete', suggestionSelector, function () {
                 that.activate($(this).data('index'));
             });
 
             // Deselect active element when mouse leaves suggestions container:
             container.on('mouseout.autocomplete', function () {
                 that.selectedIndex = -1;
                 container.children('.' + selected).removeClass(selected);
             });
 
             // Listen for click event on suggestions list:
             container.on('click.autocomplete', suggestionSelector, function () {
                 that.select($(this).data('index'));
             });
 
             that.fixPositionCapture = function () {
                 if (that.visible) {
                     that.fixPosition();
                 }
             };
 
             $(window).on('resize.autocomplete', that.fixPositionCapture);
 
             that.el.on('keydown.autocomplete', function (e) { that.onKeyPress(e); });
             that.el.on('keyup.autocomplete', function (e) { that.onKeyUp(e); });
             that.el.on('blur.autocomplete', function () { that.onBlur(); });
             that.el.on('focus.autocomplete', function () { that.onFocus(); });
             that.el.on('change.autocomplete', function (e) { that.onKeyUp(e); });
         },
 
         onFocus: function () {
             var that = this;
             that.fixPosition();
             if (that.options.minChars <= that.el.val().length) {
                 that.onValueChange();
             }
         },
 
         onBlur: function () {
             this.enableKillerFn();
         },
 
         setOptions: function (suppliedOptions) {
             var that = this,
                 options = that.options;
 
             $.extend(options, suppliedOptions);
 
             that.isLocal = $.isArray(options.lookup);
 
             if (that.isLocal) {
                 options.lookup = that.verifySuggestionsFormat(options.lookup);
             }
 
             options.orientation = that.validateOrientation(options.orientation, 'bottom');
 
             // Adjust height, width and z-index:
             $(that.suggestionsContainer).css({
                 'max-height': options.maxHeight + 'px',
                 'width': options.width + 'px',
                 'z-index': options.zIndex
             });
         },
 
         clearCache: function () {
             this.cachedResponse = {};
             this.badQueries = [];
         },
 
         clear: function () {
             this.clearCache();
             this.currentValue = '';
             this.suggestions = [];
         },
 
         disable: function () {
             var that = this;
             that.disabled = true;
             if (that.currentRequest) {
                 that.currentRequest.abort();
             }
         },
 
         enable: function () {
             this.disabled = false;
         },
 
         fixPosition: function () {
             // Use only when container has already its content
 
             var that = this,
                 $container = $(that.suggestionsContainer),
                 containerParent = $container.parent().get(0);
             // Fix position automatically when appended to body.
             // In other cases force parameter must be given.
             if (containerParent !== document.body && !that.options.forceFixPosition)
                 return;
 
             // Choose orientation
             var orientation = that.options.orientation,
                 containerHeight = $container.outerHeight(),
                 height = that.el.outerHeight(),
                 offset = that.el.offset(),
                 styles = { 'top': offset.top, 'left': offset.left };
 
             if (orientation == 'auto') {
                 var viewPortHeight = $(window).height(),
                     scrollTop = $(window).scrollTop(),
                     topOverflow = -scrollTop + offset.top - containerHeight,
                     bottomOverflow = scrollTop + viewPortHeight - (offset.top + height + containerHeight);
 
                 orientation = (Math.max(topOverflow, bottomOverflow) === topOverflow)
                                 ? 'top'
                                 : 'bottom';
             }
 
             if (orientation === 'top') {
                 styles.top += -containerHeight;
             } else {
                 styles.top += height;
             }
 
             // If container is not positioned to body,
             // correct its position using offset parent offset
             if(containerParent !== document.body) {
                 var opacity = $container.css('opacity'),
                     parentOffsetDiff;
 
                     if (!that.visible){
                         $container.css('opacity', 0).show();
                     }
 
                 parentOffsetDiff = $container.offsetParent().offset();
                 styles.top -= parentOffsetDiff.top;
                 styles.left -= parentOffsetDiff.left;
 
                 if (!that.visible){
                     $container.css('opacity', opacity).hide();
                 }
             }
 
             // -2px to account for suggestions border.
             if (that.options.width === 'auto') {
                 styles.width = (that.el.outerWidth() - 2) + 'px';
             }
 
             $container.css(styles);
         },
 
         enableKillerFn: function () {
             var that = this;
             $(document).on('click.autocomplete', that.killerFn);
         },
 
         disableKillerFn: function () {
             var that = this;
             $(document).off('click.autocomplete', that.killerFn);
         },
 
         killSuggestions: function () {
             var that = this;
             that.stopKillSuggestions();
             that.intervalId = window.setInterval(function () {
                 that.hide();
                 that.stopKillSuggestions();
             }, 50);
         },
 
         stopKillSuggestions: function () {
             window.clearInterval(this.intervalId);
         },
 
         isCursorAtEnd: function () {
             var that = this,
                 valLength = that.el.val().length,
                 selectionStart = that.element.selectionStart,
                 range;
 
             if (typeof selectionStart === 'number') {
                 return selectionStart === valLength;
             }
             if (document.selection) {
                 range = document.selection.createRange();
                 range.moveStart('character', -valLength);
                 return valLength === range.text.length;
             }
             return true;
         },
 
         onKeyPress: function (e) {
             var that = this;
 
             // If suggestions are hidden and user presses arrow down, display suggestions:
             if (!that.disabled && !that.visible && e.which === keys.DOWN && that.currentValue) {
                 that.suggest();
                 return;
             }
 
             if (that.disabled || !that.visible) {
                 return;
             }
 
             switch (e.which) {
                 case keys.ESC:
                     that.el.val(that.currentValue);
                     that.hide();
                     break;
                 case keys.RIGHT:
                     if (that.hint && that.options.onHint && that.isCursorAtEnd()) {
                         that.selectHint();
                         break;
                     }
                     return;
                 case keys.TAB:
                     if (that.hint && that.options.onHint) {
                         that.selectHint();
                         return;
                     }
                     // Fall through to RETURN
                 case keys.RETURN:
                     if (that.selectedIndex === -1) {
                         that.hide();
                         return;
                     }
                     that.select(that.selectedIndex);
                     if (e.which === keys.TAB && that.options.tabDisabled === false) {
                         return;
                     }
                     break;
                 case keys.UP:
                     that.moveUp();
                     break;
                 case keys.DOWN:
                     that.moveDown();
                     break;
                 default:
                     return;
             }
 
             // Cancel event if function did not return:
             e.stopImmediatePropagation();
             e.preventDefault();
         },
 
         onKeyUp: function (e) {
             var that = this;
 
             if (that.disabled) {
                 return;
             }
 
             switch (e.which) {
                 case keys.UP:
                 case keys.DOWN:
                     return;
             }
 
             clearInterval(that.onChangeInterval);
 
             if (that.currentValue !== that.el.val()) {
                 that.findBestHint();
                 if (that.options.deferRequestBy > 0) {
                     // Defer lookup in case when value changes very quickly:
                     that.onChangeInterval = setInterval(function () {
                         that.onValueChange();
                     }, that.options.deferRequestBy);
                 } else {
                     that.onValueChange();
                 }
             }
         },
 
         onValueChange: function () {
             var that = this,
                 options = that.options,
                 value = that.el.val(),
                 query = that.getQuery(value),
                 index;
 
             if (that.selection && that.currentValue !== query) {
                 that.selection = null;
                 (options.onInvalidateSelection || $.noop).call(that.element);
             }
 
             clearInterval(that.onChangeInterval);
             that.currentValue = value;
             that.selectedIndex = -1;
 
             // Check existing suggestion for the match before proceeding:
             if (options.triggerSelectOnValidInput) {
                 index = that.findSuggestionIndex(query);
                 if (index !== -1) {
                     that.select(index);
                     return;
                 }
             }
 
             if (query.length < options.minChars) {
                 that.hide();
             } else {
                 that.getSuggestions(query);
             }
         },
 
         findSuggestionIndex: function (query) {
             var that = this,
                 index = -1,
                 queryLowerCase = query.toLowerCase();
 
             $.each(that.suggestions, function (i, suggestion) {
                 if (suggestion.value.toLowerCase() === queryLowerCase) {
                     index = i;
                     return false;
                 }
             });
 
             return index;
         },
 
         getQuery: function (value) {
             var delimiter = this.options.delimiter,
                 parts;
 
             if (!delimiter) {
                 return value;
             }
             parts = value.split(delimiter);
             return $.trim(parts[parts.length - 1]);
         },
 
         getSuggestionsLocal: function (query) {
             var that = this,
                 options = that.options,
                 queryLowerCase = query.toLowerCase(),
                 data;
 
             // re-pack the data as it was comming from AJAX
             data = {
                 suggestions: data
             };
             return data;
         },
 
         getSuggestions: function (query) {
             var response,
                 that = this,
                 options = that.options,
                 serviceUrl = options.serviceUrl,
                 params,
                 cacheKey,
                 ajaxSettings;
 
             options.params[options.paramName] = query;
             params = options.ignoreParams ? null : options.params;
 
             if (that.isLocal) {
                 response = that.getSuggestionsLocal(query);
             } else {
                 if ($.isFunction(serviceUrl)) {
                     serviceUrl = serviceUrl.call(that.element, query);
                 }
                 cacheKey = serviceUrl + '?' + $.param(params || {});
                 response = that.cachedResponse[cacheKey];
             }
 
             if (response && $.isArray(response.suggestions)) {
                 that.suggestions = response.suggestions;
                 that.suggest();
             } else if (!that.isBadQuery(query)) {
                 if (options.onSearchStart.call(that.element, options.params) === false) {
                     return;
                 }
                 if (that.currentRequest) {
                     that.currentRequest.abort();
                 }
 
                 ajaxSettings = {
                     url: serviceUrl,
                     data: params,
                     type: options.type,
                     dataType: options.dataType
                 };
 
                 $.extend(ajaxSettings, options.ajaxSettings);
 
                 that.currentRequest = $.ajax(ajaxSettings).done(function (data) {
                     var result;
                     that.currentRequest = null;
                     result = options.transformResult(data);
                     that.processResponse(result, query, cacheKey);
                     options.onSearchComplete.call(that.element, query, result.suggestions);
                 }).fail(function (jqXHR, textStatus, errorThrown) {
                     options.onSearchError.call(that.element, query, jqXHR, textStatus, errorThrown);
                 });
             }
         },
 
         isBadQuery: function (q) {
             if (!this.options.preventBadQueries){
                 return false;
             }
 
             var badQueries = this.badQueries,
                 i = badQueries.length;
 
             while (i--) {
                 if (q.indexOf(badQueries[i]) === 0) {
                     return true;
                 }
             }
 
             return false;
         },
 
         hide: function () {
             var that = this;
             that.visible = false;
             that.selectedIndex = -1;
             $(that.suggestionsContainer).hide();
             that.signalHint(null);
         },
 
         suggest: function () {
 
             var that = this,
                 options = that.options,
                 formatResult = options.formatResult,
                 filterResult = options.lookupFilter,
                 value = that.getQuery(that.currentValue),
                 className = that.classes.suggestion,
                 classSelected = that.classes.selected,
                 container = $(that.suggestionsContainer),
                 noSuggestionsContainer = $(that.noSuggestionsContainer),
                 beforeRender = options.beforeRender,
                 limit = parseInt(that.options.lookupLimit, 10),
                 html = '',
                 index;
 
             // filter and limit given results
             var filtered_suggestions = $.grep(that.suggestions, function (suggestion) {
                 return filterResult(suggestion, value, value.toLowerCase(), that.element);
                 });
 
             if (limit && filtered_suggestions.length > limit) {
                 filtered_suggestions = filtered_suggestions.slice(0, limit);
             }
 
             if (filtered_suggestions.length === 0) {
                 this.options.showNoSuggestionNotice ? this.noSuggestions() : this.hide();
                 return;
             }
 
             if (options.triggerSelectOnValidInput) {
                 index = that.findSuggestionIndex(value);
                 if (index !== -1) {
                     that.select(index);
                     return;
                 }
             }
 
             // Build suggestions inner HTML:
             $.each(filtered_suggestions, function (i, suggestion) {
                 html += '<div class="' + className + '" data-index="' + i + '">' + formatResult(suggestion, value, Autocomplete.formatResult, that.element) + '</div>';
             });
             // set internal suggestion for INDEX pick to work correctly
             that.suggestions = filtered_suggestions;
             this.adjustContainerWidth();
 
             noSuggestionsContainer.detach();
             container.html(html);
 
             // Select first value by default:
             if (options.autoSelectFirst) {
                 that.selectedIndex = 0;
                 container.children().first().addClass(classSelected);
             }
 
             if ($.isFunction(beforeRender)) {
                 beforeRender.call(that.element, container);
             }
 
             that.fixPosition();
 
             container.show();
             that.visible = true;
 
             that.findBestHint();
         },
 
         noSuggestions: function() {
              var that = this,
                  container = $(that.suggestionsContainer),
                  noSuggestionsContainer = $(that.noSuggestionsContainer);
 
             this.adjustContainerWidth();
 
             // Some explicit steps. Be careful here as it easy to get
             // noSuggestionsContainer removed from DOM if not detached properly.
             noSuggestionsContainer.detach();
             container.empty(); // clean suggestions if any
             container.append(noSuggestionsContainer);
 
             that.fixPosition();
 
             container.show();
             that.visible = true;
         },
 
         adjustContainerWidth: function() {
             var that = this,
                 options = that.options,
                 width,
                 container = $(that.suggestionsContainer);
 
             // If width is auto, adjust width before displaying suggestions,
             // because if instance was created before input had width, it will be zero.
             // Also it adjusts if input width has changed.
             // -2px to account for suggestions border.
             if (options.width === 'auto') {
                 width = that.el.outerWidth() - 2;
                 container.width(width > 0 ? width : 300);
             }
         },
 
         findBestHint: function () {
             var that = this,
                 value = that.el.val().toLowerCase(),
                 bestMatch = null;
 
             if (!value) {
                 return;
             }
 
             $.each(that.suggestions, function (i, suggestion) {
                 var foundMatch = suggestion.value.toLowerCase().indexOf(value) === 0;
                 if (foundMatch) {
                     bestMatch = suggestion;
                 }
                 return !foundMatch;
             });
             that.signalHint(bestMatch);
         },
 
         signalHint: function (suggestion) {
             var hintValue = '',
                 that = this;
             if (suggestion) {
                 hintValue = that.currentValue + suggestion.value.substr(that.currentValue.length);
             }
             if (that.hintValue !== hintValue) {
                 that.hintValue = hintValue;
                 that.hint = suggestion;
                 (this.options.onHint || $.noop)(hintValue);
             }
         },
 
         verifySuggestionsFormat: function (suggestions) {
             // If suggestions is string array, convert them to supported format:
             if (suggestions.length && typeof suggestions[0] === 'string') {
                 return $.map(suggestions, function (value) {
                     return { value: value, data: null };
                 });
             }
 
             return suggestions;
         },
 
         validateOrientation: function(orientation, fallback) {
             orientation = $.trim(orientation || '').toLowerCase();
 
             if($.inArray(orientation, ['auto', 'bottom', 'top']) === -1){
                 orientation = fallback;
             }
 
             return orientation;
         },
 
         processResponse: function (result, originalQuery, cacheKey) {
             var that = this,
                 options = that.options;
 
             result.suggestions = that.verifySuggestionsFormat(result.suggestions);
 
             // Cache results if cache is not disabled:
             if (!options.noCache) {
                 that.cachedResponse[cacheKey] = result;
                 if (options.preventBadQueries && result.suggestions.length === 0) {
                     that.badQueries.push(originalQuery);
                 }
             }
 
             // Return if originalQuery is not matching current query:
             if (originalQuery !== that.getQuery(that.currentValue)) {
                 return;
             }
 
             that.suggestions = result.suggestions;
             that.suggest();
         },
 
         activate: function (index) {
             var that = this,
                 activeItem,
                 selected = that.classes.selected,
                 container = $(that.suggestionsContainer),
                 children = container.find('.' + that.classes.suggestion);
 
             container.find('.' + selected).removeClass(selected);
 
             that.selectedIndex = index;
 
             if (that.selectedIndex !== -1 && children.length > that.selectedIndex) {
                 activeItem = children.get(that.selectedIndex);
                 $(activeItem).addClass(selected);
                 return activeItem;
             }
 
             return null;
         },
 
         selectHint: function () {
             var that = this,
                 i = $.inArray(that.hint, that.suggestions);
             that.select(i);
         },
 
         select: function (index) {
             var that = this;
             that.hide();
             that.onSelect(index);
         },
 
         moveUp: function () {
             var that = this;
 
             if (that.selectedIndex === -1) {
                 return;
             }
 
             if (that.selectedIndex === 0) {
                 $(that.suggestionsContainer).children().first().removeClass(that.classes.selected);
                 that.selectedIndex = -1;
                 that.el.val(that.currentValue);
                 that.findBestHint();
                 return;
             }
 
             that.adjustScroll(that.selectedIndex - 1);
         },
 
         moveDown: function () {
             var that = this;
 
             if (that.selectedIndex === (that.suggestions.length - 1)) {
                 return;
             }
 
             that.adjustScroll(that.selectedIndex + 1);
         },
 
         adjustScroll: function (index) {
             var that = this,
                 activeItem = that.activate(index),
                 offsetTop,
                 upperBound,
                 lowerBound,
                 heightDelta = 25;
 
             if (!activeItem) {
                 return;
             }
 
             offsetTop = activeItem.offsetTop;
             upperBound = $(that.suggestionsContainer).scrollTop();
             lowerBound = upperBound + that.options.maxHeight - heightDelta;
 
             if (offsetTop < upperBound) {
                 $(that.suggestionsContainer).scrollTop(offsetTop);
             } else if (offsetTop > lowerBound) {
                 $(that.suggestionsContainer).scrollTop(offsetTop - that.options.maxHeight + heightDelta);
             }
 
             if (that.options.replaceOnArrowKey) {
               that.el.val(that.getValue(that.suggestions[index].value));
             }
             that.signalHint(null);
         },
 
         onSelect: function (index) {
             var that = this,
                 onSelectCallback = that.options.onSelect,
                 suggestion = that.suggestions[index];
 
             that.currentValue = that.getValue(suggestion.value);
             var prevElem = {'value': that.el.val(),
                             'caret': that.element.selectionStart}
 
             if (that.currentValue !== that.el.val()) {
                 that.el.val(that.currentValue);
             }
 
             that.signalHint(null);
             that.suggestions = [];
             that.selection = suggestion;
 
             if ($.isFunction(onSelectCallback)) {
                 onSelectCallback.call(this, that.element, suggestion, prevElem);
             }
         },
 
         getValue: function (value) {
             var that = this,
                 delimiter = that.options.delimiter,
                 currentValue,
                 parts;
 
             if (!delimiter) {
                 return value;
             }
 
             currentValue = that.currentValue;
             parts = currentValue.split(delimiter);
 
             if (parts.length === 1) {
                 return value;
             }
 
             return currentValue.substr(0, currentValue.length - parts[parts.length - 1].length) + value;
         },
 
         dispose: function () {
             var that = this;
             that.el.off('.autocomplete').removeData('autocomplete');
             that.disableKillerFn();
             $(window).off('resize.autocomplete', that.fixPositionCapture);
             $(that.suggestionsContainer).remove();
         }
     };
 
     // Create chainable jQuery plugin:
     $.fn.autocomplete = $.fn.devbridgeAutocomplete = function (options, args) {
         var dataKey = 'autocomplete';
         // If function invoked without argument return
         // instance of the first matched element:
         if (arguments.length === 0) {
             return this.first().data(dataKey);
         }
 
         return this.each(function () {
             var inputElement = $(this),
                 instance = inputElement.data(dataKey);
 
             if (typeof options === 'string') {
                 if (instance && typeof instance[options] === 'function') {
                     instance[options](args);
                 }
             } else {
                 // If instance already exists, destroy it:
                 if (instance && instance.dispose) {
                     instance.dispose();
                 }
                 instance = new Autocomplete(this, options);
                 inputElement.data(dataKey, instance);
             }
         });
     };
 }));

rhodecode/public/js/src/plugins/jquery.timeago-extension.js

@@ -1,205 +1,190 b''
 // define module
 var AgeModule = (function () {
   return {
     age: function(prevdate, now, show_short_version, show_suffix, short_format) {
 
   var prevdate =  moment(prevdate);
   var now = now || moment().utc();
 
   var show_short_version = show_short_version || false;
   var show_suffix = show_suffix || true;
   var short_format = short_format || false;
 
-  // alias for backward compat
-  var _ = function(s) {
-    if (_TM.hasOwnProperty(s)) {
-      return _TM[s];
-    }
-    return s
-  };
-
-  var ungettext = function (singular, plural, n) {
-    if (n === 1){
-      return _(singular)
-    }
-    return _(plural)
-  };
-
   var _get_relative_delta = function(now, prevdate) {
 
     var duration = moment.duration(moment(now).diff(prevdate));
     return {
       'year': duration.years(),
       'month': duration.months(),
       'day': duration.days(),
       'hour': duration.hours(),
       'minute': duration.minutes(),
       'second': duration.seconds()
     };
 
   };
 
   var _is_leap_year = function(year){
     return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0);
   };
 
   var get_month = function(prevdate) {
     return prevdate.getMonth()
   };
 
   var get_year = function(prevdate) {
     return prevdate.getYear()
   };
 
   var order = ['year', 'month', 'day', 'hour', 'minute', 'second'];
   var deltas = {};
   var future = false;
 
   if (prevdate > now) {
     var now_old = now;
     now = prevdate;
     prevdate = now_old;
     future = true;
   }
   if (future) {
     // ? remove microseconds, we don't have it in JS
   }
 
   // Get date parts deltas
   for (part in order) {
     var part = order[part];
     var rel_delta = _get_relative_delta(now, prevdate);
     deltas[part] = rel_delta[part]
   }
 
   //# Fix negative offsets (there is 1 second between 10:59:59 and 11:00:00,
   //# not 1 hour, -59 minutes and -59 seconds)
   var offsets = [[5, 60], [4, 60], [3, 24]];
   for (element in offsets) { //# seconds, minutes, hours
     var element = offsets[element];
     var num = element[0];
     var length = element[1];
 
     var part = order[num];
     var carry_part = order[num - 1];
 
     if (deltas[part] < 0){
         deltas[part] += length;
         deltas[carry_part] -= 1
     }
 
   }
 
   // # Same thing for days except that the increment depends on the (variable)
   // # number of days in the month
   var month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
   if (deltas['day'] < 0) {
     if (get_month(prevdate) == 2 && _is_leap_year(get_year(prevdate))) {
       deltas['day'] += 29;
     } else {
       deltas['day'] += month_lengths[get_month(prevdate) - 1];
     }
 
     deltas['month'] -= 1
   }
 
   if (deltas['month'] < 0) {
     deltas['month'] += 12;
     deltas['year'] -= 1;
   }
 
   //# Format the result
   if (short_format) {
     var fmt_funcs = {
       'year': function(d) {return '{0}y'.format(d)},
       'month': function(d) {return '{0}m'.format(d)},
       'day': function(d) {return '{0}d'.format(d)},
       'hour': function(d) {return '{0}h'.format(d)},
       'minute': function(d) {return '{0}min'.format(d)},
       'second': function(d) {return '{0}sec'.format(d)}
     }
 
   } else {
     var fmt_funcs = {
-      'year': function(d) {return ungettext('{0} year', '{0} years', d).format(d)},
-      'month': function(d) {return ungettext('{0} month', '{0} months', d).format(d)},
-      'day': function(d) {return ungettext('{0} day', '{0} days', d).format(d)},
-      'hour': function(d) {return ungettext('{0} hour', '{0} hours', d).format(d)},
-      'minute': function(d) {return ungettext('{0} min', '{0} min', d).format(d)},
-      'second': function(d) {return ungettext('{0} sec', '{0} sec', d).format(d)}
+      'year': function(d) {return _ngettext('{0} year', '{0} years', d).format(d)},
+      'month': function(d) {return _ngettext('{0} month', '{0} months', d).format(d)},
+      'day': function(d) {return _ngettext('{0} day', '{0} days', d).format(d)},
+      'hour': function(d) {return _ngettext('{0} hour', '{0} hours', d).format(d)},
+      'minute': function(d) {return _ngettext('{0} min', '{0} min', d).format(d)},
+      'second': function(d) {return _ngettext('{0} sec', '{0} sec', d).format(d)}
     }
 
   }
   var i = 0;
   for (part in order){
     var part = order[part];
     var value = deltas[part];
     if (value !== 0) {
 
       if (i < 5) {
         var sub_part = order[i + 1];
         var sub_value = deltas[sub_part]
       } else {
         var sub_value = 0
       }
       if (sub_value == 0 || show_short_version) {
         var _val = fmt_funcs[part](value);
         if (future) {
           if (show_suffix) {
-            return _('in {0}').format(_val)
+            return _gettext('in {0}').format(_val)
           } else {
             return _val
           }
 
         }
         else {
           if (show_suffix) {
-            return _('{0} ago').format(_val)
+            return _gettext('{0} ago').format(_val)
           } else {
             return _val
           }
         }
       }
 
       var val = fmt_funcs[part](value);
       var val_detail = fmt_funcs[sub_part](sub_value);
       if (short_format) {
         var datetime_tmpl = '{0}, {1}';
         if (show_suffix) {
-          datetime_tmpl = _('{0}, {1} ago');
+          datetime_tmpl = _gettext('{0}, {1} ago');
           if (future) {
-            datetime_tmpl = _('in {0}, {1}');
+            datetime_tmpl = _gettext('in {0}, {1}');
           }
         }
       } else {
-        var datetime_tmpl = _('{0} and {1}');
+        var datetime_tmpl = _gettext('{0} and {1}');
         if (show_suffix) {
-          datetime_tmpl = _('{0} and {1} ago');
+          datetime_tmpl = _gettext('{0} and {1} ago');
           if (future) {
-            datetime_tmpl = _('in {0} and {1}')
+            datetime_tmpl = _gettext('in {0} and {1}')
           }
         }
       }
 
       return datetime_tmpl.format(val, val_detail)
     }
     i += 1;
   }
 
-  return _('just now')
+  return _gettext('just now')
 
 },
     createTimeComponent: function(dateTime, text) {
       return '<time class="timeago tooltip" title="{1}" datetime="{0}+0000">{1}</time>'.format(dateTime, text);
     }
   }
 })();
 
 
 jQuery.timeago.settings.localeTitle = false;
 
 // auto refresh the components every Ns
 jQuery.timeago.settings.refreshMillis = templateContext.timeago.refresh_time;
 
 // Display original dates older than N days
 jQuery.timeago.settings.cutoff = templateContext.timeago.cutoff_limit;

rhodecode/public/js/src/rhodecode.js

@@ -1,422 +1,413 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 /**
 RhodeCode JS Files
 **/
 
 if (typeof console == "undefined" || typeof console.log == "undefined"){
     console = { log: function() {} }
 }
 
-
-// alias for backward compat
-var _tm = function(s) {
-    if (_TM.hasOwnProperty(s)) {
-      return _TM[s];
-    }
-    return s
-};
-
 // TODO: move the following function to submodules
 
 /**
  * show more
  */
 var show_more_event = function(){
   $('table .show_more').click(function(e) {
     var cid = e.target.id.substring(1);
     var button = $(this);
     if (button.hasClass('open')) {
       $('#'+cid).hide();
       button.removeClass('open');
     } else {
       $('#'+cid).show();
       button.addClass('open one');
     }
   });
 };
 
 var compare_radio_buttons = function(repo_name, compare_ref_type){
     $('#compare_action').on('click', function(e){
         e.preventDefault();
 
         var source = $('input[name=compare_source]:checked').val();
         var target = $('input[name=compare_target]:checked').val();
         if(source && target){
             var url_data = {
                 repo_name: repo_name,
                 source_ref: source,
                 source_ref_type: compare_ref_type,
                 target_ref: target,
                 target_ref_type: compare_ref_type,
                 merge: 1
             };
             window.location = pyroutes.url('compare_url', url_data);
         }
     });
     $('.compare-radio-button').on('click', function(e){
         var source = $('input[name=compare_source]:checked').val();
         var target = $('input[name=compare_target]:checked').val();
         if(source && target){
             $('#compare_action').removeAttr("disabled");
             $('#compare_action').removeClass("disabled");
         }
     })
 };
 
 var showRepoSize = function(target, repo_name, commit_id, callback) {
     var container = $('#' + target);
     var url = pyroutes.url('repo_stats',
       {"repo_name": repo_name, "commit_id": commit_id});
 
     if (!container.hasClass('loaded')) {
         $.ajax({url: url})
             .complete(function (data) {
                 var responseJSON = data.responseJSON;
                 container.addClass('loaded');
                 container.html(responseJSON.size);
                 callback(responseJSON.code_stats)
             })
             .fail(function (data) {
                 console.log('failed to load repo stats');
             });
     }
 
 };
 
 var showRepoStats = function(target, data){
     var container = $('#' + target);
 
     if (container.hasClass('loaded')) {
         return
     }
 
     var total = 0;
     var no_data = true;
     var tbl = document.createElement('table');
     tbl.setAttribute('class', 'trending_language_tbl');
 
     $.each(data, function(key, val){
         total += val.count;
     });
 
     var sortedStats = [];
     for (var obj in data){
         sortedStats.push([obj, data[obj]])
     }
     var sortedData = sortedStats.sort(function (a, b) {
         return b[1].count - a[1].count
     });
     var cnt = 0;
     $.each(sortedData, function(idx, val){
         cnt += 1;
         no_data = false;
 
         var hide = cnt > 2;
         var tr = document.createElement('tr');
         if (hide) {
             tr.setAttribute('style', 'display:none');
             tr.setAttribute('class', 'stats_hidden');
         }
 
         var key = val[0];
         var obj = {"desc": val[1].desc, "count": val[1].count};
 
         var percentage = Math.round((obj.count / total * 100), 2);
 
         var td1 = document.createElement('td');
         td1.width = 300;
         var trending_language_label = document.createElement('div');
         trending_language_label.innerHTML = obj.desc + " (.{0})".format(key);
         td1.appendChild(trending_language_label);
 
         var td2 = document.createElement('td');
         var trending_language = document.createElement('div');
-        var nr_files = obj.count +" "+ (obj.count === 1 ? _tm('file'): _tm('files'));
+        var nr_files = obj.count +" "+ _ngettext('file', 'files', obj.count);
 
         trending_language.title = key + " " + nr_files;
 
         trending_language.innerHTML = "<span>" + percentage + "% " + nr_files
                 + "</span><b>" + percentage + "% " + nr_files + "</b>";
 
         trending_language.setAttribute("class", 'trending_language');
         $('b', trending_language)[0].style.width = percentage + "%";
         td2.appendChild(trending_language);
 
         tr.appendChild(td1);
         tr.appendChild(td2);
         tbl.appendChild(tr);
         if (cnt == 3) {
             var show_more = document.createElement('tr');
             var td = document.createElement('td');
             lnk = document.createElement('a');
 
             lnk.href = '#';
-            lnk.innerHTML = _tm('Show more');
+            lnk.innerHTML = _ngettext('Show more');
             lnk.id = 'code_stats_show_more';
             td.appendChild(lnk);
 
             show_more.appendChild(td);
             show_more.appendChild(document.createElement('td'));
             tbl.appendChild(show_more);
         }
     });
 
     $(container).html(tbl);
     $(container).addClass('loaded');
 
     $('#code_stats_show_more').on('click', function (e) {
         e.preventDefault();
         $('.stats_hidden').each(function (idx) {
             $(this).css("display", "");
         });
         $('#code_stats_show_more').hide();
     });
 
 };
 
 
 // Toggle Collapsable Content
 function collapsableContent() {
 
     $('.collapsable-content').not('.no-hide').hide();
 
     $('.btn-collapse').unbind(); //in case we've been here before
     $('.btn-collapse').click(function() {
         var button = $(this);
         var togglename = $(this).data("toggle");
         $('.collapsable-content[data-toggle='+togglename+']').toggle();
         if ($(this).html()=="Show Less")
             $(this).html("Show More");
         else
             $(this).html("Show Less");
     });
 };
 
 var timeagoActivate = function() {
     $("time.timeago").timeago();
 };
 
 // Formatting values in a Select2 dropdown of commit references
 var formatSelect2SelectionRefs = function(commit_ref){
   var tmpl = '';
   if (!commit_ref.text || commit_ref.type === 'sha'){
     return commit_ref.text;
   }
   if (commit_ref.type === 'branch'){
     tmpl = tmpl.concat('<i class="icon-branch"></i> ');
   } else if (commit_ref.type === 'tag'){
     tmpl = tmpl.concat('<i class="icon-tag"></i> ');
   } else if (commit_ref.type === 'book'){
     tmpl = tmpl.concat('<i class="icon-bookmark"></i> ');
   }
   return tmpl.concat(commit_ref.text);
 };
 
 // takes a given html element and scrolls it down offset pixels
 function offsetScroll(element, offset){
     setTimeout(function(){
         console.log(element);
         var location = element.offset().top;
         // some browsers use body, some use html
         $('html, body').animate({ scrollTop: (location - offset) });
     }, 100);
 }
 
 /**
  * global hooks after DOM is loaded
  */
 $(document).ready(function() {
     firefoxAnchorFix();
 
     $('.navigation a.menulink').on('click', function(e){
         var menuitem = $(this).parent('li');
         if (menuitem.hasClass('open')) {
             menuitem.removeClass('open');
         } else {
             menuitem.addClass('open');
             $(document).on('click', function(event) {
                 if (!$(event.target).closest(menuitem).length) {
                     menuitem.removeClass('open');
                 }
             });
         }
     });
     // Add tooltips
     $('tr.line .lineno a').attr("title","Click to select line").addClass('tooltip');
     $('tr.line .add-comment-line a').attr("title","Click to comment").addClass('tooltip');
 
     // Set colors and styles
     $('tr.line .lineno a').hover(
         function(){
             $(this).parents('tr.line').addClass('hover');
         }, function(){
             $(this).parents('tr.line').removeClass('hover');
         }
     );
 
     $('tr.line .lineno a').click(
         function(){
             if ($(this).text() != ""){
                 $('tr.line').removeClass('selected');
                 $(this).parents("tr.line").addClass('selected');
 
                 // Replace URL without jumping to it if browser supports.
                 // Default otherwise
                 if (history.pushState) {
                     var new_location = location.href
                     if (location.hash){
                         new_location = new_location.replace(location.hash, "");
                     }
 
                     // Make new anchor url
                     var new_location = new_location+$(this).attr('href');
                     history.pushState(true, document.title, new_location);
 
                     return false;
                 }
             }
         }
     );
 
     $('tr.line .add-comment-line a').hover(
         function(){
             $(this).parents('tr.line').addClass('commenting');
         }, function(){
             $(this).parents('tr.line').removeClass('commenting');
         }
     );
 
     $('tr.line .add-comment-line a').on('click', function(e){
         var tr = $(e.currentTarget).parents('tr.line')[0];
         injectInlineForm(tr);
         return false;
     });
 
 
     $('.collapse_file').on('click', function(e) {
         e.stopPropagation();
         if ($(e.target).is('a')) { return; }
         var node = $(e.delegateTarget).first();
         var icon = $($(node.children().first()).children().first());
         var id = node.attr('fid');
         var target = $('#'+id);
         var tr = $('#tr_'+id);
         var diff = $('#diff_'+id);
         if(node.hasClass('expand_file')){
             node.removeClass('expand_file');
             icon.removeClass('expand_file_icon');
             node.addClass('collapse_file');
             icon.addClass('collapse_file_icon');
             diff.show();
             tr.show();
             target.show();
         } else {
             node.removeClass('collapse_file');
             icon.removeClass('collapse_file_icon');
             node.addClass('expand_file');
             icon.addClass('expand_file_icon');
             diff.hide();
             tr.hide();
             target.hide();
         }
     });
 
     $('#expand_all_files').click(function() {
         $('.expand_file').each(function() {
             var node = $(this);
             var icon = $($(node.children().first()).children().first());
             var id = $(this).attr('fid');
             var target = $('#'+id);
             var tr = $('#tr_'+id);
             var diff = $('#diff_'+id);
             node.removeClass('expand_file');
             icon.removeClass('expand_file_icon');
             node.addClass('collapse_file');
             icon.addClass('collapse_file_icon');
             diff.show();
             tr.show();
             target.show();
         });
     });
 
     $('#collapse_all_files').click(function() {
         $('.collapse_file').each(function() {
             var node = $(this);
             var icon = $($(node.children().first()).children().first());
             var id = $(this).attr('fid');
             var target = $('#'+id);
             var tr = $('#tr_'+id);
             var diff = $('#diff_'+id);
             node.removeClass('collapse_file');
             icon.removeClass('collapse_file_icon');
             node.addClass('expand_file');
             icon.addClass('expand_file_icon');
             diff.hide();
             tr.hide();
             target.hide();
         });
     });
 
     // Mouse over behavior for comments and line selection
 
     // Select the line that comes from the url anchor
     // At the time of development, Chrome didn't seem to support jquery's :target
     // element, so I had to scroll manually
     if (location.hash) {
         var splitIx = location.hash.indexOf('/?/');
         if (splitIx !== -1){
             var loc  = location.hash.slice(0, splitIx);
             var remainder = location.hash.slice(splitIx + 2);
         }
         else{
             var loc  = location.hash;
             var remainder = null;
         }
         if (loc.length > 1){
             var lineno = $(loc+'.lineno');
             if (lineno.length > 0){
                 var tr = lineno.parents('tr.line');
                 tr.addClass('selected');
 
                 // once we scrolled into our line, trigger chat app
                 if (remainder){
                     tr.find('.add-comment-line a').trigger( "click" );
                     setTimeout(function(){
                         var nextNode = $(tr).next();
                         if(nextNode.hasClass('inline-comments')){
                             nextNode.next().find('.switch-to-chat').trigger( "click" );
                         }
                         else{
                             nextNode.find('.switch-to-chat').trigger( "click" );
                         }
                         // trigger scroll into, later so all elements are already loaded
                         tr[0].scrollIntoView();
                     }, 250);
 
                 }
                 else{
                     tr[0].scrollIntoView();
                 }
             }
         }
     };
 
     collapsableContent();
 });

rhodecode/public/js/src/rhodecode/codemirror.js

@@ -1,530 +1,530 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 /**
  * Code Mirror
  */
 // global code-mirror logger;, to enable run
 // Logger.get('CodeMirror').setLevel(Logger.DEBUG)
 
 cmLog = Logger.get('CodeMirror');
 cmLog.setLevel(Logger.OFF);
 
 
 //global cache for inline forms
 var userHintsCache = {};
 
 
 var initCodeMirror = function(textAreadId, resetUrl, focus, options) {
   var ta = $('#' + textAreadId).get(0);
   if (focus === undefined) {
       focus = true;
   }
 
   // default options
   var codeMirrorOptions = {
     mode: "null",
     lineNumbers: true,
     indentUnit: 4,
     autofocus: focus
   };
 
   if (options !== undefined) {
     // extend with custom options
     codeMirrorOptions = $.extend(true, codeMirrorOptions, options);
   }
 
   var myCodeMirror = CodeMirror.fromTextArea(ta, codeMirrorOptions);
 
   $('#reset').on('click', function(e) {
     window.location = resetUrl;
   });
 
   return myCodeMirror;
 };
 
 var initCommentBoxCodeMirror = function(textAreaId, triggerActions){
   var initialHeight = 100;
 
   // global timer, used to cancel async loading
   var loadUserHintTimer;
 
   if (typeof userHintsCache === "undefined") {
     userHintsCache = {};
     cmLog.debug('Init empty cache for mentions');
   }
   if (!$(textAreaId).get(0)) {
     cmLog.debug('Element for textarea not found', textAreaId);
     return;
   }
   var escapeRegExChars = function(value) {
     return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
   };
   /**
    * Load hints from external source returns an array of objects in a format
    * that hinting lib requires
    * @returns {Array}
    */
   var loadUserHints = function(query, triggerHints) {
     cmLog.debug('Loading mentions users via AJAX');
     var _users = [];
     $.ajax({
         type: 'GET',
         data: {query: query},
         url: pyroutes.url('user_autocomplete_data'),
         headers: {'X-PARTIAL-XHR': true},
         async: true
     })
     .done(function(data) {
       var tmpl = '<img class="gravatar" src="{0}"/>{1}';
       $.each(data.suggestions, function(i) {
         var userObj = data.suggestions[i];
 
         if (userObj.username !== "default") {
           _users.push({
             text: userObj.username + " ",
             org_text: userObj.username,
             displayText: userObj.value_display, // search that field
             // internal caches
             _icon_link: userObj.icon_link,
             _text: userObj.value_display,
 
             render: function(elt, data, completion) {
               var el = document.createElement('div');
               el.className = "CodeMirror-hint-entry";
               el.innerHTML = tmpl.format(
                   completion._icon_link, completion._text);
               elt.appendChild(el);
             }
           });
         }
       });
       cmLog.debug('Mention users loaded');
       // set to global cache
       userHintsCache[query] = _users;
       triggerHints(userHintsCache[query]);
     })
     .fail(function(data, textStatus, xhr) {
       alert("error processing request: " + textStatus);
     });
   };
 
     /**
      * filters the results based on the current context
      * @param users
      * @param context
      * @returns {Array}
      */
     var filterUsers = function(users, context) {
       var MAX_LIMIT = 10;
       var filtered_users = [];
       var curWord = context.string;
 
       cmLog.debug('Filtering users based on query:', curWord);
       $.each(users, function(i) {
         var match = users[i];
         var searchText = match.displayText;
 
         if (!curWord ||
           searchText.toLowerCase().lastIndexOf(curWord) !== -1) {
           // reset state
           match._text = match.displayText;
           if (curWord) {
             // do highlighting
             var pattern = '(' + escapeRegExChars(curWord) + ')';
             match._text = searchText.replace(
               new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
           }
 
             filtered_users.push(match);
         }
         // to not return to many results, use limit of filtered results
         if (filtered_users.length > MAX_LIMIT) {
           return false;
         }
       });
 
       return filtered_users;
     };
 
     /**
      * Filter action based on typed in text
      * @param actions
      * @param context
      * @returns {Array}
      */
 
     var filterActions = function(actions, context){
       var MAX_LIMIT = 10;
       var filtered_actions= [];
       var curWord = context.string;
 
       cmLog.debug('Filtering actions based on query:', curWord);
       $.each(actions, function(i) {
         var match = actions[i];
         var searchText = match.displayText;
 
         if (!curWord ||
           searchText.toLowerCase().lastIndexOf(curWord) !== -1) {
           // reset state
           match._text = match.displayText;
           if (curWord) {
             // do highlighting
             var pattern = '(' + escapeRegExChars(curWord) + ')';
             match._text = searchText.replace(
               new RegExp(pattern, 'gi'), '<strong>$1<\/strong>');
           }
 
           filtered_actions.push(match);
         }
         // to not return to many results, use limit of filtered results
         if (filtered_actions.length > MAX_LIMIT) {
             return false;
         }
       });
       return filtered_actions;
     };
 
     var completeAfter = function(cm, pred) {
       var options = {
         completeSingle: false,
         async: true,
         closeOnUnfocus: true
       };
         var cur = cm.getCursor();
       setTimeout(function() {
         if (!cm.state.completionActive) {
           cmLog.debug('Trigger mentions hinting');
           CodeMirror.showHint(cm, CodeMirror.hint.mentions, options);
         }
       }, 100);
 
       // tell CodeMirror we didn't handle the key
       // trick to trigger on a char but still complete it
       return CodeMirror.Pass;
     };
 
     var submitForm = function(cm, pred) {
       $(cm.display.input.textarea.form).submit();
       return CodeMirror.Pass;
     };
 
     var completeActions = function(cm, pred) {
       var cur = cm.getCursor();
       var options = {
         closeOnUnfocus: true
       };
       setTimeout(function() {
         if (!cm.state.completionActive) {
           cmLog.debug('Trigger actions hinting');
           CodeMirror.showHint(cm, CodeMirror.hint.actions, options);
         }
       }, 100);
     };
 
     var extraKeys = {
       "'@'": completeAfter,
       Tab: function(cm) {
         // space indent instead of TABS
         var spaces = new Array(cm.getOption("indentUnit") + 1).join(" ");
         cm.replaceSelection(spaces);
       }
     };
     // submit form on Meta-Enter
     if (OSType === "mac") {
       extraKeys["Cmd-Enter"] = submitForm;
     }
     else {
       extraKeys["Ctrl-Enter"] = submitForm;
     }
 
     if (triggerActions) {
       extraKeys["Ctrl-Space"] = completeActions;
     }
 
     var cm = CodeMirror.fromTextArea($(textAreaId).get(0), {
       lineNumbers: false,
       indentUnit: 4,
       viewportMargin: 30,
       // this is a trick to trigger some logic behind codemirror placeholder
       // it influences styling and behaviour.
       placeholder: " ",
       extraKeys: extraKeys,
       lineWrapping: true
     });
 
     cm.setSize(null, initialHeight);
     cm.setOption("mode", DEFAULT_RENDERER);
     CodeMirror.autoLoadMode(cm, DEFAULT_RENDERER); // load rst or markdown mode
     cmLog.debug('Loading codemirror mode', DEFAULT_RENDERER);
     // start listening on changes to make auto-expanded editor
     cm.on("change", function(self) {
       var height = initialHeight;
       var lines = self.lineCount();
       if ( lines > 6 && lines < 20) {
         height = "auto";
       }
       else if (lines >= 20){
         zheight = 20*15;
       }
       self.setSize(null, height);
     });
 
     var mentionHint = function(editor, callback, options) {
       var cur = editor.getCursor();
       var curLine = editor.getLine(cur.line).slice(0, cur.ch);
 
       // match on @ +1char
       var tokenMatch = new RegExp(
           '(^@| @)([a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]*)$').exec(curLine);
 
       var tokenStr = '';
       if (tokenMatch !== null && tokenMatch.length > 0){
         tokenStr = tokenMatch[0].strip();
       } else {
         // skip if we didn't match our token
         return;
       }
 
       var context = {
         start: (cur.ch - tokenStr.length) + 1,
         end: cur.ch,
         string: tokenStr.slice(1),
         type: null
       };
 
       // case when we put the @sign in fron of a string,
       // eg <@ we put it here>sometext then we need to prepend to text
       if (context.end > cur.ch) {
         context.start = context.start + 1; // we add to the @ sign
         context.end = cur.ch; // don't eat front part just append
         context.string = context.string.slice(1, cur.ch - context.start);
       }
 
       cmLog.debug('Mention context', context);
 
       var triggerHints = function(userHints){
         return callback({
           list: filterUsers(userHints, context),
           from: CodeMirror.Pos(cur.line, context.start),
           to: CodeMirror.Pos(cur.line, context.end)
         });
       };
 
       var queryBasedHintsCache = undefined;
       // if we have something in the cache, try to fetch the query based cache
       if (userHintsCache !== {}){
         queryBasedHintsCache = userHintsCache[context.string];
       }
 
       if (queryBasedHintsCache !== undefined) {
         cmLog.debug('Users loaded from cache');
         triggerHints(queryBasedHintsCache);
       } else {
         // this takes care for async loading, and then displaying results
         // and also propagates the userHintsCache
         window.clearTimeout(loadUserHintTimer);
         loadUserHintTimer = setTimeout(function() {
             loadUserHints(context.string, triggerHints);
         }, 300);
       }
     };
 
     var actionHint = function(editor, options) {
       var cur = editor.getCursor();
       var curLine = editor.getLine(cur.line).slice(0, cur.ch);
 
       var tokenMatch = new RegExp('[a-zA-Z]{1}[a-zA-Z]*$').exec(curLine);
 
       var tokenStr = '';
       if (tokenMatch !== null && tokenMatch.length > 0){
         tokenStr = tokenMatch[0].strip();
       }
 
       var context = {
         start: cur.ch - tokenStr.length,
         end: cur.ch,
         string: tokenStr,
         type: null
       };
 
       var actions = [
         {
           text: "approve",
-          displayText: _TM['Set status to Approved'],
+          displayText: _gettext('Set status to Approved'),
           hint: function(CodeMirror, data, completion) {
             CodeMirror.replaceRange("", completion.from || data.from,
                         completion.to || data.to, "complete");
             $('#change_status').select2("val", 'approved').trigger('change');
           },
           render: function(elt, data, completion) {
             var el = document.createElement('div');
             el.className = "flag_status flag_status_comment_box approved pull-left";
             elt.appendChild(el);
 
             el = document.createElement('span');
             el.innerHTML = completion.displayText;
             elt.appendChild(el);
           }
         },
         {
           text: "reject",
-          displayText: _TM['Set status to Rejected'],
+          displayText: _gettext('Set status to Rejected'),
           hint: function(CodeMirror, data, completion) {
               CodeMirror.replaceRange("", completion.from || data.from,
                           completion.to || data.to, "complete");
               $('#change_status').select2("val", 'rejected').trigger('change');
           },
           render: function(elt, data, completion) {
               var el = document.createElement('div');
               el.className = "flag_status flag_status_comment_box rejected pull-left";
               elt.appendChild(el);
 
               el = document.createElement('span');
               el.innerHTML = completion.displayText;
               elt.appendChild(el);
           }
         }
       ];
 
       return {
         list: filterActions(actions, context),
         from: CodeMirror.Pos(cur.line, context.start),
         to: CodeMirror.Pos(cur.line, context.end)
       };
     };
     CodeMirror.registerHelper("hint", "mentions", mentionHint);
     CodeMirror.registerHelper("hint", "actions", actionHint);
     return cm;
 };
 
 var setCodeMirrorMode = function(codeMirrorInstance, mode) {
   CodeMirror.autoLoadMode(codeMirrorInstance, mode);
   codeMirrorInstance.setOption("mode", mode);
 };
 
 var setCodeMirrorLineWrap = function(codeMirrorInstance, line_wrap) {
   codeMirrorInstance.setOption("lineWrapping", line_wrap);
 };
 
 var setCodeMirrorModeFromSelect = function(
   targetSelect, targetFileInput, codeMirrorInstance, callback){
 
   $(targetSelect).on('change', function(e) {
     cmLog.debug('codemirror select2 mode change event !');
     var selected = e.currentTarget;
     var node = selected.options[selected.selectedIndex];
     var mimetype = node.value;
     cmLog.debug('picked mimetype', mimetype);
     var new_mode = $(node).attr('mode');
     setCodeMirrorMode(codeMirrorInstance, new_mode);
     cmLog.debug('set new mode', new_mode);
 
     //propose filename from picked mode
     cmLog.debug('setting mimetype', mimetype);
     var proposed_ext = getExtFromMimeType(mimetype);
     cmLog.debug('file input', $(targetFileInput).val());
     var file_data = getFilenameAndExt($(targetFileInput).val());
     var filename = file_data.filename || 'filename1';
     $(targetFileInput).val(filename + proposed_ext);
     cmLog.debug('proposed file', filename + proposed_ext);
 
 
     if (typeof(callback) === 'function') {
       try {
         cmLog.debug('running callback', callback);
         callback(filename, mimetype, new_mode);
       } catch (err) {
         console.log('failed to run callback', callback, err);
       }
     }
     cmLog.debug('finish iteration...');
   });
 };
 
 var setCodeMirrorModeFromInput = function(
   targetSelect, targetFileInput, codeMirrorInstance, callback) {
 
   // on type the new filename set mode
   $(targetFileInput).on('keyup', function(e) {
     var file_data = getFilenameAndExt(this.value);
     if (file_data.ext === null) {
       return;
     }
 
     var mimetypes = getMimeTypeFromExt(file_data.ext, true);
     cmLog.debug('mimetype from file', file_data, mimetypes);
     var detected_mode;
     var detected_option;
     for (var i in mimetypes) {
       var mt = mimetypes[i];
       if (!detected_mode) {
         detected_mode = detectCodeMirrorMode(this.value, mt);
       }
 
       if (!detected_option) {
         cmLog.debug('#mimetype option[value="{0}"]'.format(mt));
         if ($(targetSelect).find('option[value="{0}"]'.format(mt)).length) {
           detected_option = mt;
         }
       }
     }
 
     cmLog.debug('detected mode', detected_mode);
     cmLog.debug('detected option', detected_option);
     if (detected_mode && detected_option){
 
       $(targetSelect).select2("val", detected_option);
       setCodeMirrorMode(codeMirrorInstance, detected_mode);
 
       if(typeof(callback) === 'function'){
         try{
           cmLog.debug('running callback', callback);
           var filename = file_data.filename + "." + file_data.ext;
           callback(filename, detected_option, detected_mode);
         }catch (err){
           console.log('failed to run callback', callback, err);
         }
       }
     }
 
   });
 };
 
 var fillCodeMirrorOptions = function(targetSelect) {
   //inject new modes, based on codeMirrors modeInfo object
   var modes_select = $(targetSelect);
   for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
     var m = CodeMirror.modeInfo[i];
     var opt = new Option(m.name, m.mime);
     $(opt).attr('mode', m.mode);
     modes_select.append(opt);
   }
 };
 
 var CodeMirrorPreviewEnable = function(edit_mode) {
   // in case it a preview enabled mode enable the button
   if (['markdown', 'rst', 'gfm'].indexOf(edit_mode) !== -1) {
     $('#render_preview').removeClass('hidden');
   }
   else {
     if (!$('#render_preview').hasClass('hidden')) {
       $('#render_preview').addClass('hidden');
     }
   }
 };

rhodecode/public/js/src/rhodecode/comments.js

@@ -1,664 +1,664 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 var firefoxAnchorFix = function() {
   // hack to make anchor links behave properly on firefox, in our inline
   // comments generation when comments are injected firefox is misbehaving
   // when jumping to anchor links
   if (location.href.indexOf('#') > -1) {
     location.href += '';
   }
 };
 
 // returns a node from given html;
 var fromHTML = function(html){
   var _html = document.createElement('element');
   _html.innerHTML = html;
   return _html;
 };
 
 var tableTr = function(cls, body){
   var _el = document.createElement('div');
   var _body = $(body).attr('id');
   var comment_id = fromHTML(body).children[0].id.split('comment-')[1];
   var id = 'comment-tr-{0}'.format(comment_id);
   var _html = ('<table><tbody><tr id="{0}" class="{1}">'+
                '<td class="add-comment-line"><span class="add-comment-content"></span></td>'+
                '<td></td>'+
                '<td></td>'+
                '<td>{2}</td>'+
                '</tr></tbody></table>').format(id, cls, body);
   $(_el).html(_html);
   return _el.children[0].children[0].children[0];
 };
 
 var removeInlineForm = function(form) {
   form.parentNode.removeChild(form);
 };
 
 var createInlineForm = function(parent_tr, f_path, line) {
   var tmpl = $('#comment-inline-form-template').html();
   tmpl = tmpl.format(f_path, line);
   var form = tableTr('comment-form-inline', tmpl);
   var form_hide_button = $(form).find('.hide-inline-form');
 
   $(form_hide_button).click(function(e) {
      $('.inline-comments').removeClass('hide-comment-button');
      var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode;
      if ($(newtr.nextElementSibling).hasClass('inline-comments-button')) {
          $(newtr.nextElementSibling).show();
      }
      $(newtr).parents('.comment-form-inline').remove();
      $(parent_tr).removeClass('form-open');
      $(parent_tr).removeClass('hl-comment');
   });
 
   return form;
 };
 
 var getLineNo = function(tr) {
   var line;
   // Try to get the id and return "" (empty string) if it doesn't exist
   var o = ($(tr).find('.lineno.old').attr('id')||"").split('_');
   var n = ($(tr).find('.lineno.new').attr('id')||"").split('_');
   if (n.length >= 2) {
     line = n[n.length-1];
   } else if (o.length >= 2) {
    line = o[o.length-1];
   }
   return line;
 };
 
 /**
  * make a single inline comment and place it inside
  */
 var renderInlineComment = function(json_data, show_add_button) {
   show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
   try {
     var html = json_data.rendered_text;
     var lineno = json_data.line_no;
     var target_id = json_data.target_id;
     placeInline(target_id, lineno, html, show_add_button);
   } catch (e) {
     console.error(e);
   }
 };
 
 function bindDeleteCommentButtons() {
     $('.delete-comment').one('click', function() {
         var comment_id = $(this).data("comment-id");
 
         if (comment_id){
             deleteComment(comment_id);
         }
     });
 }
 
 /**
  * Inject inline comment for on given TR this tr should be always an .line
  * tr containing the line. Code will detect comment, and always put the comment
  * block at the very bottom
  */
 var injectInlineForm = function(tr){
   if (!$(tr).hasClass('line')) {
       return;
   }
 
   var _td = $(tr).find('.code').get(0);
   if ($(tr).hasClass('form-open') ||
       $(tr).hasClass('context') ||
       $(_td).hasClass('no-comment')) {
       return;
   }
   $(tr).addClass('form-open');
   $(tr).addClass('hl-comment');
   var node = $(tr.parentNode.parentNode.parentNode).find('.full_f_path').get(0);
   var f_path = $(node).attr('path');
   var lineno = getLineNo(tr);
   var form = createInlineForm(tr, f_path, lineno);
 
   var parent = tr;
   while (1) {
       var n = parent.nextElementSibling;
       // next element are comments !
       if ($(n).hasClass('inline-comments')) {
           parent = n;
       }
       else {
           break;
       }
   }
   var _parent = $(parent).get(0);
   $(_parent).after(form);
   $('.comment-form-inline').prev('.inline-comments').addClass('hide-comment-button');
   var f = $(form).get(0);
 
   var _form = $(f).find('.inline-form').get(0);
 
   $('.switch-to-chat', _form).on('click', function(evt){
     var fParent = $(_parent).closest('.injected_diff').parent().prev('*[fid]');
     var fid = fParent.attr('fid');
 
     // activate chat and trigger subscription to channels
     $.Topic('/chat_controller').publish({
       action:'subscribe_to_channels',
       data: ['/chat${0}$/fid/{1}/{2}'.format(templateContext.repo_name, fid, lineno)]
     });
     $(_form).closest('td').find('.comment-inline-form').addClass('hidden');
     $(_form).closest('td').find('.chat-holder').removeClass('hidden');
   });
 
   var pullRequestId = templateContext.pull_request_data.pull_request_id;
   var commitId = templateContext.commit_data.commit_id;
 
   var commentForm = new CommentForm(_form, commitId, pullRequestId, lineno, false);
   var cm = commentForm.getCmInstance();
 
   // set a CUSTOM submit handler for inline comments.
   commentForm.setHandleFormSubmit(function(o) {
     var text = commentForm.cm.getValue();
 
     if (text === "") {
       return;
     }
 
     if (lineno === undefined) {
       alert('missing line !');
       return;
     }
     if (f_path === undefined) {
       alert('missing file path !');
       return;
     }
 
     var excludeCancelBtn = false;
     var submitEvent = true;
     commentForm.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
     commentForm.cm.setOption("readOnly", true);
     var postData = {
         'text': text,
         'f_path': f_path,
         'line': lineno,
         'csrf_token': CSRF_TOKEN
     };
     var submitSuccessCallback = function(o) {
       $(tr).removeClass('form-open');
       removeInlineForm(f);
       renderInlineComment(o);
       $('.inline-comments').removeClass('hide-comment-button');
 
       // re trigger the linkification of next/prev navigation
       linkifyComments($('.inline-comment-injected'));
       timeagoActivate();
       tooltip_activate();
       bindDeleteCommentButtons();
       commentForm.setActionButtonsDisabled(false);
 
     };
     var submitFailCallback = function(){
         commentForm.resetCommentFormState(text)
     };
     commentForm.submitAjaxPOST(
         commentForm.submitUrl, postData, submitSuccessCallback, submitFailCallback);
   });
 
   setTimeout(function() {
       // callbacks
       if (cm !== undefined) {
           cm.focus();
       }
   }, 10);
 
 };
 
 var deleteComment = function(comment_id) {
   var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__', comment_id);
   var postData = {
     '_method': 'delete',
     'csrf_token': CSRF_TOKEN
   };
 
   var success = function(o) {
     window.location.reload();
   };
   ajaxPOST(url, postData, success);
 };
 
 var createInlineAddButton = function(tr){
-  var label = _TM['Add another comment'];
+  var label = _gettext('Add another comment');
   var html_el = document.createElement('div');
   $(html_el).addClass('add-comment');
   html_el.innerHTML = '<span class="btn btn-secondary">{0}</span>'.format(label);
   var add = new $(html_el);
   add.on('click', function(e) {
     injectInlineForm(tr);
   });
   return add;
 };
 
 var placeAddButton = function(target_tr){
   if(!target_tr){
     return;
   }
   var last_node = target_tr;
   // scan
   while (1){
     var n = last_node.nextElementSibling;
     // next element are comments !
     if($(n).hasClass('inline-comments')){
       last_node = n;
       // also remove the comment button from previous
       var comment_add_buttons = $(last_node).find('.add-comment');
       for(var i=0; i<comment_add_buttons.length; i++){
         var b = comment_add_buttons[i];
         b.parentNode.removeChild(b);
       }
     }
     else{
       break;
     }
   }
   var add = createInlineAddButton(target_tr);
   // get the comment div
   var comment_block = $(last_node).find('.comment')[0];
   // attach add button
   $(add).insertAfter(comment_block);
 };
 
 /**
  * Places the inline comment into the changeset block in proper line position
  */
 var placeInline = function(target_container, lineno, html, show_add_button) {
   show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
 
   var lineid = "{0}_{1}".format(target_container, lineno);
   var target_line = $('#' + lineid).get(0);
   var comment = new $(tableTr('inline-comments', html));
   // check if there are comments already !
   var parent_node = target_line.parentNode;
   var root_parent = parent_node;
   while (1) {
     var n = parent_node.nextElementSibling;
     // next element are comments !
     if ($(n).hasClass('inline-comments')) {
       parent_node = n;
     }
     else {
       break;
     }
   }
   // put in the comment at the bottom
   $(comment).insertAfter(parent_node);
   $(comment).find('.comment-inline').addClass('inline-comment-injected');
   // scan nodes, and attach add button to last one
   if (show_add_button) {
     placeAddButton(root_parent);
   }
 
   return target_line;
 };
 
 var linkifyComments = function(comments) {
 
   for (var i = 0; i < comments.length; i++) {
     var comment_id = $(comments[i]).data('comment-id');
     var prev_comment_id = $(comments[i - 1]).data('comment-id');
     var next_comment_id = $(comments[i + 1]).data('comment-id');
 
     // place next/prev links
     if (prev_comment_id) {
       $('#prev_c_' + comment_id).show();
       $('#prev_c_' + comment_id + " a.arrow_comment_link").attr(
           'href', '#comment-' + prev_comment_id).removeClass('disabled');
     }
     if (next_comment_id) {
       $('#next_c_' + comment_id).show();
       $('#next_c_' + comment_id + " a.arrow_comment_link").attr(
           'href', '#comment-' + next_comment_id).removeClass('disabled');
     }
     // place a first link to the total counter
     if (i === 0) {
       $('#inline-comments-counter').attr('href', '#comment-' + comment_id);
     }
   }
 
 };
   
 /**
  * Iterates over all the inlines, and places them inside proper blocks of data
  */
 var renderInlineComments = function(file_comments, show_add_button) {
   show_add_button = typeof show_add_button !== 'undefined' ? show_add_button : true;
 
   for (var i = 0; i < file_comments.length; i++) {
     var box = file_comments[i];
 
     var target_id = $(box).attr('target_id');
 
     // actually comments with line numbers
     var comments = box.children;
 
     for (var j = 0; j < comments.length; j++) {
       var data = {
         'rendered_text': comments[j].outerHTML,
         'line_no': $(comments[j]).attr('line'),
         'target_id': target_id
       };
       renderInlineComment(data, show_add_button);
     }
   }
 
   // since order of injection is random, we're now re-iterating
   // from correct order and filling in links
   linkifyComments($('.inline-comment-injected'));
   bindDeleteCommentButtons();
   firefoxAnchorFix();
 };
 
 
 /* Comment form for main and inline comments */
 var CommentForm = (function() {
     "use strict";
 
     function CommentForm(formElement, commitId, pullRequestId, lineNo, initAutocompleteActions) {
 
         this.withLineNo = function(selector) {
             var lineNo = this.lineNo;
             if (lineNo === undefined) {
                 return selector
             } else {
                 return selector + '_' + lineNo;
             }
         };
 
         this.commitId = commitId;
         this.pullRequestId = pullRequestId;
         this.lineNo = lineNo;
         this.initAutocompleteActions = initAutocompleteActions;
 
         this.previewButton = this.withLineNo('#preview-btn');
         this.previewContainer = this.withLineNo('#preview-container');
 
         this.previewBoxSelector = this.withLineNo('#preview-box');
 
         this.editButton = this.withLineNo('#edit-btn');
         this.editContainer = this.withLineNo('#edit-container');
 
         this.cancelButton = this.withLineNo('#cancel-btn');
 
         this.statusChange = '#change_status';
         this.cmBox = this.withLineNo('#text');
         this.cm = initCommentBoxCodeMirror(this.cmBox, this.initAutocompleteActions);
 
         this.submitForm = formElement;
         this.submitButton = $(this.submitForm).find('input[type="submit"]');
         this.submitButtonText = this.submitButton.val();
 
         this.previewUrl = pyroutes.url('changeset_comment_preview',
             {'repo_name': templateContext.repo_name});
 
         // based on commitId, or pullReuqestId decide where do we submit
         // out data
         if (this.commitId){
             this.submitUrl = pyroutes.url('changeset_comment',
                 {'repo_name': templateContext.repo_name,
                  'revision': this.commitId});
 
         } else if (this.pullRequestId) {
             this.submitUrl = pyroutes.url('pullrequest_comment',
                 {'repo_name': templateContext.repo_name,
                  'pull_request_id': this.pullRequestId});
 
         } else {
             throw new Error(
                 'CommentForm requires pullRequestId, or commitId to be specified.')
         }
 
         this.getCmInstance = function(){
             return this.cm
         };
 
         var self = this;
 
         this.getCommentStatus = function() {
           return $(this.submitForm).find(this.statusChange).val();
         };
 
         this.isAllowedToSubmit = function() {
           return !$(this.submitButton).prop('disabled');
         };
 
         this.initStatusChangeSelector = function(){
             var formatChangeStatus = function(state, escapeMarkup) {
                 var originalOption = state.element;
                 return '<div class="flag_status ' + $(originalOption).data('status') + ' pull-left"></div>' +
                        '<span>' + escapeMarkup(state.text) + '</span>';
             };
             var formatResult = function(result, container, query, escapeMarkup) {
                 return formatChangeStatus(result, escapeMarkup);
             };
 
             var formatSelection = function(data, container, escapeMarkup) {
                 return formatChangeStatus(data, escapeMarkup);
             };
 
             $(this.submitForm).find(this.statusChange).select2({
-                placeholder: _TM['Status Review'],
+                placeholder: _gettext('Status Review'),
                 formatResult: formatResult,
                 formatSelection: formatSelection,
                 containerCssClass: "drop-menu status_box_menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 dropdownAutoWidth: true,
                 minimumResultsForSearch: -1
             });
             $(this.submitForm).find(this.statusChange).on('change', function() {
                 var status = self.getCommentStatus();
                 if (status && !self.lineNo) {
                     $(self.submitButton).prop('disabled', false);
                 }
                 //todo, fix this name
-                var placeholderText = _TM['Comment text will be set automatically based on currently selected status ({0}) ...'].format(status);
+                var placeholderText = _gettext('Comment text will be set automatically based on currently selected status ({0}) ...').format(status);
                 self.cm.setOption('placeholder', placeholderText);
             })
         };
 
         // reset the comment form into it's original state
         this.resetCommentFormState = function(content) {
             content = content || '';
 
             $(this.editContainer).show();
             $(this.editButton).hide();
 
             $(this.previewContainer).hide();
             $(this.previewButton).show();
 
             this.setActionButtonsDisabled(true);
             self.cm.setValue(content);
             self.cm.setOption("readOnly", false);
         };
 
         this.submitAjaxPOST = function(url, postData, successHandler, failHandler) {
             failHandler = failHandler || function() {};
             var postData = toQueryString(postData);
             var request = $.ajax({
                     url: url,
                     type: 'POST',
                     data: postData,
                     headers: {'X-PARTIAL-XHR': true}
                 })
                 .done(function(data) {
                     successHandler(data);
                 })
                 .fail(function(data, textStatus, errorThrown){
                     alert(
                         "Error while submitting comment.\n" +
                         "Error code {0} ({1}).".format(data.status, data.statusText));
                     failHandler()
                 });
             return request;
         };
 
         // overwrite a submitHandler, we need to do it for inline comments
         this.setHandleFormSubmit = function(callback) {
             this.handleFormSubmit = callback;
         };
 
         // default handler for for submit for main comments
         this.handleFormSubmit = function() {
             var text = self.cm.getValue();
             var status = self.getCommentStatus();
 
             if (text === "" && !status) {
                 return;
             }
 
             var excludeCancelBtn = false;
             var submitEvent = true;
             self.setActionButtonsDisabled(true, excludeCancelBtn, submitEvent);
             self.cm.setOption("readOnly", true);
             var postData = {
                 'text': text,
                 'changeset_status': status,
                 'csrf_token': CSRF_TOKEN
             };
 
             var submitSuccessCallback = function(o) {
                 if (status) {
                     location.reload(true);
                 } else {
                     $('#injected_page_comments').append(o.rendered_text);
                     self.resetCommentFormState();
                     bindDeleteCommentButtons();
                     timeagoActivate();
                     tooltip_activate();
                 }
             };
             var submitFailCallback = function(){
                 self.resetCommentFormState(text)
             };
             self.submitAjaxPOST(
                 self.submitUrl, postData, submitSuccessCallback, submitFailCallback);
         };
 
         this.previewSuccessCallback = function(o) {
             $(self.previewBoxSelector).html(o);
             $(self.previewBoxSelector).removeClass('unloaded');
 
             // swap buttons
             $(self.previewButton).hide();
             $(self.editButton).show();
 
             // unlock buttons
             self.setActionButtonsDisabled(false);
         };
 
         this.setActionButtonsDisabled = function(state, excludeCancelBtn, submitEvent) {
             excludeCancelBtn = excludeCancelBtn || false;
             submitEvent = submitEvent || false;
 
             $(this.editButton).prop('disabled', state);
             $(this.previewButton).prop('disabled', state);
 
             if (!excludeCancelBtn) {
                 $(this.cancelButton).prop('disabled', state);
             }
 
             var submitState = state;
             if (!submitEvent && this.getCommentStatus() && !this.lineNo) {
                 // if the value of commit review status is set, we allow
                 // submit button, but only on Main form, lineNo means inline
                 submitState = false
             }
             $(this.submitButton).prop('disabled', submitState);
             if (submitEvent) {
-              $(this.submitButton).val(_TM['Submitting...']);
+              $(this.submitButton).val(_gettext('Submitting...'));
             } else {
               $(this.submitButton).val(this.submitButtonText);
             }
 
         };
 
         // lock preview/edit/submit buttons on load, but exclude cancel button
         var excludeCancelBtn = true;
         this.setActionButtonsDisabled(true, excludeCancelBtn);
 
         // anonymous users don't have access to initialized CM instance
         if (this.cm !== undefined){
             this.cm.on('change', function(cMirror) {
                 if (cMirror.getValue() === "") {
                     self.setActionButtonsDisabled(true, excludeCancelBtn)
                 } else {
                     self.setActionButtonsDisabled(false, excludeCancelBtn)
                 }
             });
         }
 
         $(this.editButton).on('click', function(e) {
             e.preventDefault();
 
             $(self.previewButton).show();
             $(self.previewContainer).hide();
             $(self.editButton).hide();
             $(self.editContainer).show();
 
         });
 
         $(this.previewButton).on('click', function(e) {
             e.preventDefault();
             var text = self.cm.getValue();
 
             if (text === "") {
                 return;
             }
 
             var postData = {
                 'text': text,
                 'renderer': DEFAULT_RENDERER,
                 'csrf_token': CSRF_TOKEN
             };
 
             // lock ALL buttons on preview
             self.setActionButtonsDisabled(true);
 
             $(self.previewBoxSelector).addClass('unloaded');
-            $(self.previewBoxSelector).html(_TM['Loading ...']);
+            $(self.previewBoxSelector).html(_gettext('Loading ...'));
             $(self.editContainer).hide();
             $(self.previewContainer).show();
 
             // by default we reset state of comment preserving the text
             var previewFailCallback = function(){
                 self.resetCommentFormState(text)
             };
             self.submitAjaxPOST(
                 self.previewUrl, postData, self.previewSuccessCallback, previewFailCallback);
 
         });
 
         $(this.submitForm).submit(function(e) {
             e.preventDefault();
             var allowedToSubmit = self.isAllowedToSubmit();
             if (!allowedToSubmit){
                return false;
             }
             self.handleFormSubmit();
         });
 
     }
 
     return CommentForm;
 })();

rhodecode/public/js/src/rhodecode/files.js

@@ -1,309 +1,309 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 /**
  * Search file list
  */
 // global reference to file-node filter
 var _NODEFILTER = {};
 
 var fileBrowserListeners = function(node_list_url, url_base){
   var n_filter = $('#node_filter').get(0);
 
   _NODEFILTER.filterTimeout = null;
   var nodes = null;
 
   _NODEFILTER.fetchNodes = function(callback) {
     $.ajax({url: node_list_url, headers: {'X-PARTIAL-XHR': true}})
       .done(function(data){
         nodes = data.nodes;
         if (callback) {
           callback();
         }
       })
       .fail(function(data){
         console.log('failed to load');
       });
   };
 
   _NODEFILTER.fetchNodesCallback = function() {
     $('#node_filter_box_loading').hide();
     $('#node_filter_box').removeClass('hidden').show();
     n_filter.focus();
     if ($('#node_filter').hasClass('init')){
       n_filter.value = '';
       $('#node_filter').removeClass('init');
     }
   };
 
   _NODEFILTER.initFilter = function(){
     $('#node_filter_box_loading').removeClass('hidden').show();
     $('#search_activate_id').hide();
     $('#search_deactivate_id').removeClass('hidden').show();
     $('#add_node_id').hide();
     _NODEFILTER.fetchNodes(_NODEFILTER.fetchNodesCallback);
   };
 
   _NODEFILTER.resetFilter = function(){
     $('#node_filter_box_loading').hide();
     $('#node_filter_box').hide();
     $('#search_activate_id').show();
     $('#search_deactivate_id').hide();
     $('#add_node_id').show();
     $('#tbody').show();
     $('#tbody_filtered').hide();
     $('#node_filter').val('');
   };
 
   _NODEFILTER.fuzzy_match = function(filepath, query) {
     var highlight = [];
     var order = 0;
     for (var i = 0; i < query.length; i++) {
       var match_position = filepath.indexOf(query[i]);
       if (match_position !== -1) {
         var prev_match_position = highlight[highlight.length-1];
         if (prev_match_position === undefined) {
           highlight.push(match_position);
         } else {
           var current_match_position = prev_match_position + match_position + 1;
           highlight.push(current_match_position);
           order = order + current_match_position - prev_match_position;
         }
         filepath = filepath.substring(match_position+1);
       } else {
         return false;
       }
     }
     return {'order': order,
             'highlight': highlight};
   };
 
   _NODEFILTER.sortPredicate = function(a, b) {
     if (a.order < b.order) return -1;
     if (a.order > b.order) return 1;
     if (a.filepath < b.filepath) return -1;
     if (a.filepath > b.filepath) return 1;
     return 0;
   };
 
   _NODEFILTER.updateFilter = function(elem, e) {
     return function(){
       // Reset timeout
       _NODEFILTER.filterTimeout = null;
       var query = elem.value.toLowerCase();
       var match = [];
       var matches_max = 20;
       if (query !== ""){
         var results = [];
         for(var k=0;k<nodes.length;k++){
           var result = _NODEFILTER.fuzzy_match(
               nodes[k].name.toLowerCase(), query);
           if (result) {
             result.type = nodes[k].type;
             result.filepath = nodes[k].name;
             results.push(result);
           }
         }
         results = results.sort(_NODEFILTER.sortPredicate);
         var limit = matches_max;
         if (results.length < matches_max) {
           limit = results.length;
         }
         for (var i=0; i<limit; i++){
           if(query && results.length > 0){
             var n = results[i].filepath;
             var t = results[i].type;
             var n_hl = n.split("");
             var pos = results[i].highlight;
             for (var j = 0; j < pos.length; j++) {
                 n_hl[pos[j]] = "<em>" + n_hl[pos[j]] + "</em>";
             }
             n_hl = n_hl.join("");
             var new_url = url_base.replace('__FPATH__',n);
 
             var typeObj = {
               dir: 'icon-folder browser-dir',
               file: 'icon-file browser-file'
             };
             var typeIcon = '<i class="{0}"></i>'.format(typeObj[t]);
             match.push('<tr class="browser-result"><td><a class="browser-{0} pjax-link" href="{1}">{2}{3}</a></td><td colspan="5"></td></tr>'.format(t,new_url,typeIcon, n_hl));
           }
         }
         if(results.length > limit){
           var truncated_count = results.length - matches_max;
           if (truncated_count === 1) {
-            match.push('<tr><td>{0} {1}</td><td colspan="5"></td></tr>'.format(truncated_count, _TM['truncated result']));
+            match.push('<tr><td>{0} {1}</td><td colspan="5"></td></tr>'.format(truncated_count, _gettext('truncated result')));
           } else {
-            match.push('<tr><td>{0} {1}</td><td colspan="5"></td></tr>'.format(truncated_count, _TM['truncated results']));
+            match.push('<tr><td>{0} {1}</td><td colspan="5"></td></tr>'.format(truncated_count, _gettext('truncated results')));
           }
         }
       }
       if (query !== ""){
         $('#tbody').hide();
         $('#tbody_filtered').show();
 
         if (match.length === 0){
-          match.push('<tr><td>{0}</td><td colspan="5"></td></tr>'.format(_TM['No matching files']));
+          match.push('<tr><td>{0}</td><td colspan="5"></td></tr>'.format(_gettext('No matching files')));
         }
         $('#tbody_filtered').html(match.join(""));
       }
       else{
         $('#tbody').show();
         $('#tbody_filtered').hide();
       }
 
     };
   };
 
   var scrollDown = function(element){
     var elementBottom = element.offset().top + $(element).outerHeight();
     var windowBottom = window.innerHeight + $(window).scrollTop();
     if (elementBottom > windowBottom) {
       var offset = elementBottom - window.innerHeight;
       $('html,body').scrollTop(offset);
       return false;
     }
     return true;
   };
 
   var scrollUp = function(element){
     if (element.offset().top < $(window).scrollTop()) {
       $('html,body').scrollTop(element.offset().top);
       return false;
     }
     return true;
   };
 
   $('#filter_activate').click(function() {
     _NODEFILTER.initFilter();
   });
 
   $('#filter_deactivate').click(function() {
     _NODEFILTER.resetFilter();
   });
 
   $(n_filter).click(function() {
     if ($('#node_filter').hasClass('init')){
       n_filter.value = '';
       $('#node_filter').removeClass('init');
     }
   });
 
   $(n_filter).keydown(function(e) {
     if (e.keyCode === 40){ // Down
       if ($('.browser-highlight').length === 0){
         $('.browser-result').first().addClass('browser-highlight');
       } else {
         var next = $('.browser-highlight').next();
         if (next.length !== 0) {
           $('.browser-highlight').removeClass('browser-highlight');
           next.addClass('browser-highlight');
         }
       }
       scrollDown($('.browser-highlight'));
     }
     if (e.keyCode === 38){ // Up
       e.preventDefault();
       if ($('.browser-highlight').length !== 0){
         var next = $('.browser-highlight').prev();
         if (next.length !== 0) {
           $('.browser-highlight').removeClass('browser-highlight');
           next.addClass('browser-highlight');
         }
       }
       scrollUp($('.browser-highlight'));
     }
     if (e.keyCode === 13){ // Enter
       if ($('.browser-highlight').length !== 0){
         var url = $('.browser-highlight').find('.pjax-link').attr('href');
         $.pjax({url: url, container: '#pjax-container', timeout: pjaxTimeout});
       }
     }
     if (e.keyCode === 27){ // Esc
       _NODEFILTER.resetFilter();
       $('html,body').scrollTop(0);
     }
   });
   var capture_keys = [40, 38, 39, 37, 13, 27];
   $(n_filter).keyup(function(e) {
     if ($.inArray(e.keyCode, capture_keys) === -1){
       clearTimeout(_NODEFILTER.filterTimeout);
       _NODEFILTER.filterTimeout = setTimeout(_NODEFILTER.updateFilter(n_filter, e),200);
     }
   });
 };
 
 var getIdentNode = function(n){
   // iterate through nodes until matched interesting node
   if (typeof n === 'undefined'){
     return -1;
   }
   if(typeof n.id !== "undefined" && n.id.match('L[0-9]+')){
     return n;
   }
   else{
     return getIdentNode(n.parentNode);
   }
 };
 
 var getSelectionLink = function(e) {
   // get selection from start/to nodes
   if (typeof window.getSelection !== "undefined") {
     s = window.getSelection();
 
     from = getIdentNode(s.anchorNode);
     till = getIdentNode(s.focusNode);
 
     f_int = parseInt(from.id.replace('L',''));
     t_int = parseInt(till.id.replace('L',''));
 
     if (f_int > t_int){
       // highlight from bottom
       offset = -35;
       ranges = [t_int,f_int];
     }
     else{
       // highligth from top
       offset = 35;
       ranges = [f_int,t_int];
     }
     // if we select more than 2 lines
     if (ranges[0] !== ranges[1]){
       if($('#linktt').length === 0){
         hl_div = document.createElement('div');
         hl_div.id = 'linktt';
       }
       hl_div.innerHTML = '';
 
       anchor = '#L'+ranges[0]+'-'+ranges[1];
       var link = document.createElement('a');
       link.href = location.href.substring(0,location.href.indexOf('#'))+anchor;
-      link.innerHTML = _TM['Selection link'];
+      link.innerHTML = _gettext('Selection link');
       hl_div.appendChild(link);
       $('#codeblock').append(hl_div);
 
       var xy = $(till).offset();
       $('#linktt').addClass('hl-tip-box tip-box');
       $('#linktt').offset({top: xy.top + offset, left: xy.left});
       $('#linktt').css('visibility','visible');
     }
     else{
       $('#linktt').css('visibility','hidden');
     }
   }
 };

rhodecode/public/js/src/rhodecode/followers.js

@@ -1,74 +1,74 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 var onSuccessFollow = function(target){
     var f = $(target);
     var f_cnt = $('#current_followers_count');
 
     if(f.hasClass('follow')){
         f.removeClass('follow');
         f.addClass('following');
-        f.attr('title', _TM['Stop following this repository']);
-        $(f).html(_TM['Unfollow']);
+        f.attr('title', _gettext('Stop following this repository'));
+        $(f).html(_gettext('Unfollow'));
         if(f_cnt.length){
             var cnt = Number(f_cnt.html())+1;
             f_cnt.html(cnt);
         }
     }
     else{
         f.removeClass('following');
         f.addClass('follow');
-        f.attr('title', _TM['Start following this repository']);
-        $(f).html(_TM['Follow']);
+        f.attr('title', _gettext('Start following this repository'));
+        $(f).html(_gettext('Follow'));
         if(f_cnt.length){
             var cnt = Number(f_cnt.html())-1;
             f_cnt.html(cnt);
         }
     }
 };
 
 // TODO:: check if the function is needed. 0 usage found
 var toggleFollowingUser = function(target,follows_user_id,token,user_id){
     var args = {
         'follows_user_id': follows_user_id,
         'auth_token': token,
         'csrf_token': CSRF_TOKEN
     };
     if(user_id != undefined){
         args.user_id = user_id
     }
     ajaxPOST(pyroutes.url('toggle_following'), args, function(){
         onSuccessFollow(target);
     });
     return false;
 };
 
 var toggleFollowingRepo = function(target,follows_repo_id,token,user_id){
     var args = {
         'follows_repo_id': follows_repo_id,
         'auth_token': token,
         'csrf_token': CSRF_TOKEN
     };
     if(user_id != undefined){
         args.user_id = user_id
     }
     ajaxPOST(pyroutes.url('toggle_following'), args, function(){
         onSuccessFollow(target);
     });
     return false;
 };

rhodecode/public/js/src/rhodecode/tooltips.js

@@ -1,126 +1,126 b''
 // # Copyright (C) 2010-2016  RhodeCode GmbH
 // #
 // # This program is free software: you can redistribute it and/or modify
 // # it under the terms of the GNU Affero General Public License, version 3
 // # (only), as published by the Free Software Foundation.
 // #
 // # This program is distributed in the hope that it will be useful,
 // # but WITHOUT ANY WARRANTY; without even the implied warranty of
 // # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // # GNU General Public License for more details.
 // #
 // # You should have received a copy of the GNU Affero General Public License
 // # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #
 // # This program is dual-licensed. If you wish to learn more about the
 // # RhodeCode Enterprise Edition, including its added features, Support services,
 // # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 /**
  * TOOLTIP IMPL.
  */
 
 var TTIP = {};
 
 TTIP.main = {
     offset:     [15,15],
     maxWidth:   600,
 
     set_listeners: function(tt){
         $(tt).mouseover(tt, yt.show_tip);
         $(tt).mousemove(tt, yt.move_tip);
         $(tt).mouseout(tt, yt.close_tip);
     },
 
     init: function(){
         $('#tip-box').remove();
         yt.tipBox = document.createElement('div');
         document.body.appendChild(yt.tipBox);
         yt.tipBox.id = 'tip-box';
 
         $(yt.tipBox).hide();
         $(yt.tipBox).css('position', 'absolute');
         if(yt.maxWidth !== null){
           $(yt.tipBox).css('max-width', yt.maxWidth+'px');
         }
 
         var tooltips = $('.tooltip');
         var ttLen = tooltips.length;
 
         for(i=0;i<ttLen;i++){
             yt.set_listeners(tooltips[i]);
         }
     },
 
     show_tip: function(e, el){
         e.stopPropagation();
         e.preventDefault();
         var el = e.data || el;
         if(el.tagName.toLowerCase() === 'img'){
             yt.tipText = el.alt ? el.alt : '';
         } else {
             yt.tipText = el.title ? el.title : '';
         }
 
         if(yt.tipText !== ''){
             // save org title
             $(el).attr('tt_title', yt.tipText);
             // reset title to not show org tooltips
             $(el).attr('title', '');
 
             yt.tipBox.innerHTML = yt.tipText;
             $(yt.tipBox).show();
         }
     },
 
     move_tip: function(e, el){
         e.stopPropagation();
         e.preventDefault();
         var el = e.data || el;
         var movePos = [e.pageX, e.pageY];
         $(yt.tipBox).css('top', (movePos[1] + yt.offset[1]) + 'px')
         $(yt.tipBox).css('left', (movePos[0] + yt.offset[0]) + 'px')
     },
 
     close_tip: function(e, el){
         e.stopPropagation();
         e.preventDefault();
         var el = e.data || el;
         $(yt.tipBox).hide();
         $(el).attr('title', $(el).attr('tt_title'));
         $('#tip-box').hide();
     }
 };
 
 /**
  * tooltip activate
  */
 var tooltip_activate = function(){
     yt = TTIP.main;
     $(document).ready(yt.init);
 };
 
 /**
  * show changeset tooltip
  */
 var show_changeset_tooltip = function(){
     $('.lazy-cs').mouseover(function(e) {
         var target = e.currentTarget;
         var rid = $(target).attr('raw_id');
         var repo_name = $(target).attr('repo_name');
         var ttid = 'tt-'+rid;
         var success = function(o){
             $(target).addClass('tooltip')
             $(target).attr('title', o['message']);
             TTIP.main.show_tip(e, target);
         }
         if(rid && !$(target).hasClass('tooltip')){
             $(target).attr('id', ttid);
-            $(target).attr('title', _TM['loading ...']);
+            $(target).attr('title', _gettext('loading ...'));
             TTIP.main.set_listeners(target);
             TTIP.main.show_tip(e, target);
             var url = pyroutes.url('changeset_info', {"repo_name":repo_name, "revision": rid});
             ajaxGET(url, success);
         }
     });
 };

rhodecode/templates/admin/auth/auth_settings.html

@@ -1,116 +1,116 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Authentication Settings')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Authentication Plugins')}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
   <div class="title">
     ${self.breadcrumbs()}
   </div>
 
   <div class='sidebar-col-wrapper'>
 
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           % for item in resource.get_root().get_nav_list():
             <li ${'class=active' if item == resource else ''}>
               <a href="${request.resource_path(item, route_name='auth_home')}">${item.display_name}</a>
             </li>
           % endfor
         </ul>
     </div>
 
     <div class="main-content-full-width">
       ${h.secure_form(request.resource_path(resource, route_name='auth_home'))}
       <div class="form">
 
         <div class="panel panel-default">
 
           <div class="panel-heading">
             <h3 class="panel-title">${_("Enabled and Available Plugins")}</h3>
           </div>
 
           <div class="fields panel-body">
 
             <div class="field">
               <div class="label">${_("Enabled Plugins")}</div>
               <div class="textarea text-area editor">
                   ${h.textarea('auth_plugins',cols=23,rows=5,class_="medium")}
               </div>
               <p class="help-block">
               ${_('Add a list of plugins, separated by commas. '
                   'The order of the plugins is also the order in which '
                   'RhodeCode Enterprise will try to authenticate a user.')}
               </p>
             </div>
 
             <div class="field">
               <div class="label">${_('Available Built-in Plugins')}</div>
               <ul class="auth_plugins">
               %for plugin in available_plugins:
                   <li>
                     <div class="auth_buttons">
                         <span plugin_id="${plugin.get_id()}" class="toggle-plugin btn ${'btn-success' if plugin.get_id() in enabled_plugins else ''}">
                           ${_('enabled') if plugin.get_id() in enabled_plugins else _('disabled')}
                         </span>
                         ${plugin.get_display_name()} (${plugin.get_id()})
                     </div>
                   </li>
               %endfor
               </ul>
             </div>
 
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
             </div>
           </div>
         </div>
       </div>
       ${h.end_form()}
     </div>
   </div>
 </div>
 
 <script>
   $('.toggle-plugin').click(function(e){
     var auth_plugins_input = $('#auth_plugins');
     var notEmpty = function(element, index, array) {
       return (element != "");
     }
     var elems = auth_plugins_input.val().split(',').filter(notEmpty);
     var cur_button = e.currentTarget;
     var plugin_id = $(cur_button).attr('plugin_id');
     if($(cur_button).hasClass('btn-success')){
       elems.splice(elems.indexOf(plugin_id), 1);
       auth_plugins_input.val(elems.join(','));
       $(cur_button).removeClass('btn-success');
-      cur_button.innerHTML = _TM['disabled'];
+      cur_button.innerHTML = _gettext('disabled');
     }
     else{
       if(elems.indexOf(plugin_id) == -1){
         elems.push(plugin_id);
       }
       auth_plugins_input.val(elems.join(','));
       $(cur_button).addClass('btn-success');
-      cur_button.innerHTML = _TM['enabled'];
+      cur_button.innerHTML = _gettext('enabled');
     }
   });
 </script>
 </%def>

rhodecode/templates/admin/users/users.html

@@ -1,141 +1,141 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('Users administration')}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="user_count">0</span>
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='admin')}
 </%def>
 
 <%def name="main()">
 <div class="box">
 
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
             <a href="${h.url('new_user')}" class="btn btn-small btn-success">${_(u'Add User')}</a>
           </li>
         </ul>
     </div>
 
     <div id="repos_list_wrap">
         <table id="user_list_table" class="display"></table>
     </div>
 </div>
 
 <script>
 $(document).ready(function() {
 
     var get_datatable_count = function(){
       var datatable = $('#user_list_table').dataTable();
       var api = datatable.api();
       var total = api.page.info().recordsDisplay;
       var active = datatable.fnGetFilteredData();
-
-      $('#user_count').text(_TM["{0} active out of {1} users"].format(active, total));
+      var _text = _gettext("{0} active out of {1} users").format(active, total);
+      $('#user_count').text(_text);
     };
 
     // custom filter that filters by username OR email
     $.fn.dataTable.ext.search.push(
         function( settings, data, dataIndex ) {
             var query = $('#q_filter').val();
             var username = data[1];
             var email = data[2];
             var first_name = data[3];
             var last_name = data[4];
 
             var query_str = username + " " +
                             email + " " +
                             first_name + " " +
                             last_name;
             if((query_str).indexOf(query) !== -1){
                 return true;
             }
             return false;
         }
     );
     // filtered data plugin
     $.fn.dataTableExt.oApi.fnGetFilteredData = function ( oSettings ) {
         var res = [];
         for ( var i=0, iLen=oSettings.fnRecordsDisplay() ; i<iLen ; i++ ) {
             var record = oSettings.aoData[i]._aData;
             if(record['active_raw']){
                 res.push(record);
             }
         }
         return res.length;
     };
 
     // user list
     $('#user_list_table').DataTable({
       data: ${c.data|n},
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 1, "asc" ]],
       columns: [
          { data: {"_": "gravatar"}, className: "td-gravatar" },
          { data: {"_": "username",
                   "sort": "username_raw"}, title: "${_('Username')}", className: "td-user" },
          { data: {"_": "email",
                   "sort": "email"}, title: "${_('Email')}", className: "td-email"  },
          { data: {"_": "first_name",
                   "sort": "first_name"}, title: "${_('First Name')}", className: "td-user" },
          { data: {"_": "last_name",
                   "sort": "last_name"}, title: "${_('Last Name')}", className: "td-user" },
          { data: {"_": "last_login",
                   "sort": "last_login_raw",
                   "type": Number}, title: "${_('Last login')}", className: "td-time" },
          { data: {"_": "active",
                   "sort": "active_raw"}, title: "${_('Active')}", className: "td-active" },
          { data: {"_": "admin",
                   "sort": "admin_raw"}, title: "${_('Admin')}", className: "td-admin" },
          { data: {"_": "extern_type",
                   "sort": "extern_type"}, title: "${_('Authentication type')}", className: "td-type"  },
          { data: {"_": "action",
                   "sort": "action"}, title: "${_('Action')}", className: "td-action" }
       ],
       language: {
           paginate: DEFAULT_GRID_PAGINATION
       },
       "initComplete": function( settings, json ) {
           get_datatable_count();
           tooltip_activate();
       },
       "createdRow": function ( row, data, index ) {
           if (!data['active_raw']){
             $(row).addClass('closed')
           }
       }
     });
 
     // update the counter when doing search
     $('#user_list_table').on( 'search.dt', function (e,settings) {
       get_datatable_count();
     });
 
     // filter, filter both grids
     $('#q_filter').on( 'keyup', function () {
       var user_api = $('#user_list_table').dataTable().api();
       user_api
         .draw();
     });
 
     // refilter table if page load via back button
     $("#q_filter").trigger('keyup');
 
   });
 
 </script>
 
 </%def>

rhodecode/templates/changelog/changelog.html

@@ -1,415 +1,415 b''
 ## -*- coding: utf-8 -*-
 
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('%s Changelog') % c.repo_name}
     %if c.changelog_for_path:
       /${c.changelog_for_path}
     %endif
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     %if c.changelog_for_path:
      /${c.changelog_for_path}
     %endif
       ${ungettext('showing %d out of %d commit', 'showing %d out of %d commits', c.showing_commits) % (c.showing_commits, c.total_cs)}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='changelog')}
 </%def>
 
 <%def name="main()">
 
 <div class="box">
     <div class="title">
         ${self.repo_page_title(c.rhodecode_db_repo)}
         <ul class="links">
             <li>
                 <a href="#" class="btn btn-small" id="rev_range_container" style="display:none;"></a>
                 %if c.rhodecode_db_repo.fork:
                     <span>
                         <a  id="compare_fork_button"
                             title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}"
                             class="btn btn-small"
                             href="${h.url('compare_url',
                                 repo_name=c.rhodecode_db_repo.fork.repo_name,
                                 source_ref_type=c.rhodecode_db_repo.landing_rev[0],
                                 source_ref=c.rhodecode_db_repo.landing_rev[1],
                                 target_repo=c.repo_name,
                                 target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0],
                                 target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1],
                                 merge=1)
                             }">
                                 <i class="icon-loop"></i>
                                 ${_('Compare fork with Parent (%s)' % c.rhodecode_db_repo.fork.repo_name)}
                         </a>
                     </span>
                 %endif
 
                 ## pr open link
                 %if h.is_hg(c.rhodecode_repo) or h.is_git(c.rhodecode_repo):
                     <span>
                         <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}">
                             ${_('Open new pull request')}
                         </a>
                     </span>
                 %endif
 
                 ## clear selection
                 <div title="${_('Clear selection')}" class="btn" id="rev_range_clear" style="display:none">
                     ${_('Clear selection')}
                 </div>
 
             </li>
         </ul>
     </div>
 
     % if c.pagination:
 
         <div class="graph-header">
             <div id="filter_changelog">
                 ${h.hidden('branch_filter')}
                  %if c.selected_name:
                  <div class="btn btn-default" id="clear_filter" >
                      ${_('Clear filter')}
                  </div>
                 %endif
             </div>
             ${self.breadcrumbs('breadcrumbs_light')}
         </div>
 
     <div id="graph">
         <div class="graph-col-wrapper">
           <div id="graph_nodes">
             <div id="graph_canvas" data-graph='${c.jsdata|n}'></div>
         </div>
         <div id="graph_content" class="main-content graph_full_width">
 
           <div class="table">
             <table id="changesets" class="rctable">
                 <tr>
                   <th></th>
                   <th></th>
                   <th>${_('Author')}</th>
                   <th>${_('Age')}</th>
                   <th></th>
                   <th>${_('Commit Message')}</th>
                   <th>${_('Commit')}</th>
                   <th></th>
                   <th>${_('Refs')}</th>
                 </tr>
               <tbody>
               %for cnt,commit in enumerate(c.pagination):
                 <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
 
                     <td class="td-checkbox">
                         ${h.checkbox(commit.raw_id,class_="commit-range")}
                     </td>
                     <td class="td-status">
 
                     %if c.statuses.get(commit.raw_id):
                       <div class="changeset-status-ico">
                         %if c.statuses.get(commit.raw_id)[2]:
                           <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
                             <div class="${'flag_status %s' % c.statuses.get(commit.raw_id)[0]}"></div>
                           </a>
                         %else:
                           <a class="tooltip" title="${_('Commit status: %s') % h.commit_status_lbl(c.statuses.get(commit.raw_id)[0])}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
                             <div class="${'flag_status %s' % c.statuses.get(commit.raw_id)[0]}"></div>
                           </a>
                         %endif
                       </div>
                     %endif
                     </td>
                     <td class="td-user">
                       ${self.gravatar(h.email_or_none(commit.author))}
                       <span title="${commit.author}" class="user">${h.link_to_user(commit.author, length=22)}</span>
                     </td>
                     <td class="td-time">
                         ${h.age_component(commit.date)}
                     </td>
 
                     <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
                       <div class="show_more_col">
                         <i class="show_more"></i>&nbsp;
                       </div>
                     </td>
                     <td class="mid td-description">
                       <div class="log-container truncate-wrap">
                           <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
                       </div>
                       </td>
 
                     <td class="td-hash">
                     <code>
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
                         <span class="commit_hash">${h.show_id(commit)}</span>
                       </a>
                     </code>
                     </td>
 
                     <td class="td-comments comments-col">
                     %if c.comments.get(commit.raw_id):
                       <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
                           ${len(c.comments[commit.raw_id])} <i class="icon-comment icon-comment-colored"></i>
                       </a>
                     %endif
                     </td>
 
                     <td class="td-tags tags-col truncate-wrap">
                     <div class="truncate tags-truncate" id="t-${commit.raw_id}">
                         ## branch
                         %if commit.branch:
                           <span class="branchtag tag" title="${_('Branch %s') % commit.branch}">
                              <a href="${h.url('changelog_home',repo_name=c.repo_name,branch=commit.branch)}"><i class="icon-code-fork"></i>${h.shorter(commit.branch)}</a>
                           </span>
                         %endif
 
                         ## bookmarks
                         %if h.is_hg(c.rhodecode_repo):
                             %for book in commit.bookmarks:
                                 <span class="tag booktag" title="${_('Bookmark %s') % book}">
                                   <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-bookmark"></i>${h.shorter(book)}</a>
                                 </span>
                             %endfor
                         %endif
 
                         ## tags
                         %for tag in commit.tags:
                           <span class="tagtag tag"  title="${_('Tag %s') % tag}">
                             <a href="${h.url('files_home',repo_name=c.repo_name,revision=commit.raw_id)}"><i class="icon-tag"></i>${h.shorter(tag)}</a>
                           </span>
                         %endfor
 
                       </div>
                     </td>
                 </tr>
               %endfor
               </tbody>
             </table>
           </div>
         </div>
     </div>
     <div class="pagination-wh pagination-left">
         ${c.pagination.pager('$link_previous ~2~ $link_next')}
     </div>
 
     <script type="text/javascript" src="${h.url('/js/jquery.commits-graph.js')}"></script>
     <script type="text/javascript">
         var cache = {};
         $(function(){
 
             // Create links to commit ranges when range checkboxes are selected
              var $commitCheckboxes = $('.commit-range');
             // cache elements
             var $commitRangeContainer = $('#rev_range_container');
             var $commitRangeClear = $('#rev_range_clear');
 
             var checkboxRangeSelector = function(e){
                 var selectedCheckboxes = [];
                 for (pos in $commitCheckboxes){
                     if($commitCheckboxes[pos].checked){
                         selectedCheckboxes.push($commitCheckboxes[pos]);
                     }
                 }
                 var open_new_pull_request = $('#open_new_pull_request');
                 if(open_new_pull_request){
                       var selected_changes = selectedCheckboxes.length;
                       if (selected_changes > 1 || selected_changes == 1 && templateContext.repo_type != 'hg') {
                           open_new_pull_request.hide();
                       } else {
                           if (selected_changes == 1) {
-                             open_new_pull_request.html(_TM['Open new pull request for selected commit']);
+                             open_new_pull_request.html(_gettext('Open new pull request for selected commit'));
                           } else if (selected_changes == 0) {
-                             open_new_pull_request.html(_TM['Open new pull request']);
+                             open_new_pull_request.html(_gettext('Open new pull request'));
                           }
                           open_new_pull_request.show();
                       }
                 }
 
                 if (selectedCheckboxes.length>0){
                     var revEnd = selectedCheckboxes[0].name;
                     var revStart = selectedCheckboxes[selectedCheckboxes.length-1].name;
                     var url = pyroutes.url('changeset_home',
                             {'repo_name': '${c.repo_name}',
                              'revision': revStart+'...'+revEnd});
 
                     var link = (revStart == revEnd)
-                        ? _TM['Show selected commit __S']
-                        : _TM['Show selected commits __S ... __E'];
+                        ? _gettext('Show selected commit __S')
+                        : _gettext('Show selected commits __S ... __E');
 
                     link = link.replace('__S', revStart.substr(0,6));
                     link = link.replace('__E', revEnd.substr(0,6));
 
                     $commitRangeContainer
                         .attr('href',url)
                         .html(link)
                         .show();
 
                     $commitRangeClear.show();
                     var _url = pyroutes.url('pullrequest_home',
                                     {'repo_name': '${c.repo_name}',
                                      'commit': revEnd});
                     open_new_pull_request.attr('href', _url);
                     $('#compare_fork_button').hide();
                 } else {
                     $commitRangeContainer.hide();
                     $commitRangeClear.hide();
 
                     %if c.branch_name:
                         var _url = pyroutes.url('pullrequest_home',
                                         {'repo_name': '${c.repo_name}',
                                          'branch':'${c.branch_name}'});
                         open_new_pull_request.attr('href', _url);
                     %else:
                         var _url = pyroutes.url('pullrequest_home',
                                         {'repo_name': '${c.repo_name}'});
                         open_new_pull_request.attr('href', _url);
                     %endif
                     $('#compare_fork_button').show();
                 }
             };
 
             $commitCheckboxes.on('click', checkboxRangeSelector);
 
             $commitRangeClear.on('click',function(e) {
                 $commitCheckboxes.attr('checked', false)
                 checkboxRangeSelector();
                 e.preventDefault();
             });
 
             // make sure the buttons are consistent when navigate back and forth
             checkboxRangeSelector();
 
 
             var msgs = $('.message');
             // get first element height
             var el = $('#graph_content .container')[0];
             var row_h = el.clientHeight;
             for (var i=0; i < msgs.length; i++) {
                 var m = msgs[i];
 
                 var h = m.clientHeight;
                 var pad = $(m).css('padding');
                 if (h > row_h) {
                     var offset = row_h - (h+12);
                     $(m.nextElementSibling).css('display','block');
                     $(m.nextElementSibling).css('margin-top',offset+'px');
                 }
             }
 
             $('.expand_commit').on('click',function(e){
               var target_expand = $(this);
               var cid = target_expand.data('commitId');
 
               if (target_expand.hasClass('open')){
                 $('#c-'+cid).css({'height': '1.5em', 'white-space': 'nowrap', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
                 $('#t-'+cid).css({'height': 'auto', 'line-height': '.9em', 'text-overflow': 'ellipsis', 'overflow':'hidden', 'white-space':'nowrap'});
                 target_expand.removeClass('open');
               }
               else {
                 $('#c-'+cid).css({'height': 'auto', 'white-space': 'pre-line', 'text-overflow': 'initial', 'overflow':'visible'});
                 $('#t-'+cid).css({'height': 'auto', 'max-height': 'none', 'text-overflow': 'initial', 'overflow':'visible', 'white-space':'normal'});
                 target_expand.addClass('open');
               }
                 // redraw the graph
                 graph_options.height = $("#changesets").height();
                 $("canvas").remove();
                 $("[data-graph]").commits(graph_options);
             });
 
             $("#clear_filter").on("click", function() {
                 var filter = {'repo_name': '${c.repo_name}'};
                 window.location = pyroutes.url('changelog_home', filter);
             });
 
             $("#branch_filter").select2({
                 'dropdownAutoWidth': true,
                 'width': 'resolve',
                 'placeholder': "${c.selected_name or _('Filter changelog')}",
                 containerCssClass: "drop-menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 query: function(query){
                   var key = 'cache';
                   var cached = cache[key] ;
                   if(cached) {
                     var data = {results: []};
                     //filter results
                     $.each(cached.results, function(){
                         var section = this.text;
                         var children = [];
                         $.each(this.children, function(){
                             if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                                 children.push({'id': this.id, 'text': this.text, 'type': this.type})
                             }
                         });
                         data.results.push({'text': section, 'children': children});
                         query.callback({results: data.results});
                     });
                   }else{
                       $.ajax({
                         url: pyroutes.url('repo_refs_changelog_data', {'repo_name': '${c.repo_name}'}),
                         data: {},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                           cache[key] = data;
                           query.callback({results: data.results});
                         }
                       })
                   }
                 }
             });
 
             $('#branch_filter').on('change', function(e){
                 var data = $('#branch_filter').select2('data');
                 var selected = data.text;
                 var filter = {'repo_name': '${c.repo_name}'};
                 if(data.type == 'branch' || data.type == 'branch_closed'){
                     filter["branch"] = selected;
                 }
                 else if (data.type == 'book'){
                     filter["bookmark"] = selected;
                 }
                 window.location = pyroutes.url('changelog_home', filter);
             });
 
             // Determine max number of edges per row in graph
             var jsdata = $.parseJSON($("[data-graph]").attr('data-graph'));
             var edgeCount = 1;
             $.each(jsdata, function(i, item){
                 $.each(item[2], function(key, value) {
                     if (value[1] > edgeCount){
                         edgeCount = value[1];
                     }
                 });
             });
             var x_step = Math.min(18, Math.floor(86 / edgeCount));
             var graph_options = {
                 width: 100,
                 height: $("#changesets").height(),
                 x_step: x_step,
                 y_step: 42,
                 dotRadius: 3.5,
                 lineWidth: 2.5
             };
             $("[data-graph]").commits(graph_options);
 
         });
 
     </script>
     %else:
         ${_('There are no changes yet')}
     %endif
     </div>
 </div>
 </%def>

rhodecode/templates/changeset/changeset_file_comment.html

@@ -1,312 +1,312 b''
 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 ## ${comment.comment_block(comment)}
 ##
 <%namespace name="base" file="/base/base.html"/>
 
 <%def name="comment_block(comment, inline=False)">
   <div class="comment ${'comment-inline' if inline else ''}" id="comment-${comment.comment_id}" line="${comment.line_no}" data-comment-id="${comment.comment_id}">
       <div class="meta">
           <div class="author">
               ${base.gravatar_with_user(comment.author.email, 16)}
           </div>
           <div class="date">
               ${h.age_component(comment.modified_at, time_is_local=True)}
           </div>
           <div class="status-change">
               %if comment.pull_request:
                   <a href="${h.url('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
                       %if comment.status_change:
                           ${_('Vote on pull request #%s') % comment.pull_request.pull_request_id}:
                       %else:
                           ${_('Comment on pull request #%s') % comment.pull_request.pull_request_id}
                       %endif
                   </a>
               %else:
                   %if comment.status_change:
                       ${_('Status change on commit')}:
                   %else:
                       ${_('Comment on commit')}
                   %endif
               %endif
           </div>
           %if comment.status_change:
             <div class="${'flag_status %s' % comment.status_change[0].status}"></div>
             <div title="${_('Commit status')}" class="changeset-status-lbl">
                  ${comment.status_change[0].status_lbl}
             </div>
           %endif
           <a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
 
 
           <div class="comment-links-block">
 
             ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed
             ## only super-admin, repo admin OR comment owner can delete
             %if not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed()):
                %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
                   <div onClick="deleteComment(${comment.comment_id})" class="delete-comment"> ${_('Delete')}</div>
                   %if inline:
                     <div class="comment-links-divider"> | </div>
                   %endif
                %endif
             %endif
 
             %if inline:
 
                 <div id="prev_c_${comment.comment_id}" class="comment-previous-link" title="${_('Previous comment')}">
                   <a class="arrow_comment_link disabled"><i class="icon-left"></i></a>
                 </div>
 
                 <div id="next_c_${comment.comment_id}" class="comment-next-link" title="${_('Next comment')}">
                   <a class="arrow_comment_link disabled"><i class="icon-right"></i></a>
                 </div>
             %endif
 
           </div>
       </div>
       <div class="text">
           ${comment.render(mentions=True)|n}
       </div>
   </div>
 </%def>
 
 <%def name="comment_block_outdated(comment)">
   <div class="comments" id="comment-${comment.comment_id}">
     <div class="comment comment-wrapp">
       <div class="meta">
         <div class="author">
           ${base.gravatar_with_user(comment.author.email, 16)}
         </div>
         <div class="date">
             ${h.age_component(comment.modified_at, time_is_local=True)}
         </div>
          %if comment.status_change:
            <span class="changeset-status-container">
              <span class="changeset-status-ico">
                  <div class="${'flag_status %s' % comment.status_change[0].status}"></div>
              </span>
              <span title="${_('Commit status')}" class="changeset-status-lbl"> ${comment.status_change[0].status_lbl}</span>
            </span>
          %endif
          <a class="permalink" href="#comment-${comment.comment_id}">&para;</a>
          ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed
          ## only super-admin, repo admin OR comment owner can delete
          %if not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed()):
             <div class="comment-links-block">
                %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id:
                    <div data-comment-id=${comment.comment_id} class="delete-comment">${_('Delete')}</div>
                %endif
             </div>
          %endif
       </div>
       <div class="text">
           ${comment.render(mentions=True)|n}
       </div>
     </div>
   </div>
 </%def>
 
 <%def name="comment_inline_form()">
   <div id="comment-inline-form-template" style="display: none;">
     <div class="comment-inline-form ac">
     %if c.rhodecode_user.username != h.DEFAULT_USER:
         ${h.form('#', class_='inline-form', method='get')}
         <div id="edit-container_{1}" class="clearfix">
           <div class="comment-title pull-left">
             ${_('Create a comment on line {1}.')}
           </div>
           <div class="comment-help pull-right">
             ${(_('Comments parsed using %s syntax with %s support.') % (
                    ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
                      ('<span  class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
                  )
               )|n
              }
           </div>
               <div style="clear: both"></div>
               <textarea id="text_{1}" name="text" class="comment-block-ta ac-input"></textarea>
         </div>
         <div id="preview-container_{1}" class="clearfix" style="display: none;">
            <div class="comment-help">
                 ${_('Comment preview')}
             </div>
             <div id="preview-box_{1}" class="preview-box"></div>
         </div>
         <div class="comment-footer">
           <div class="comment-button hide-inline-form-button cancel-button">
             ${h.reset('hide-inline-form', _('Cancel'), class_='btn hide-inline-form', id_="cancel-btn_{1}")}
           </div>
           <div class="action-buttons">
             <input type="hidden" name="f_path" value="{0}">
             <input type="hidden" name="line" value="{1}">
             <button id="preview-btn_{1}" class="btn btn-secondary">${_('Preview')}</button>
             <button id="edit-btn_{1}" class="btn btn-secondary" style="display: none;">${_('Edit')}</button>
             ${h.submit('save', _('Comment'), class_='btn btn-success save-inline-form')}
           </div>
         ${h.end_form()}
       </div>
     %else:
         ${h.form('', class_='inline-form comment-form-login', method='get')}
         <div class="pull-left">
             <div class="comment-help pull-right">
-              ${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
+              ${_('You need to be logged in to comment.')} <a href="${h.route_path('login', _query={'came_from': h.url.current()})}">${_('Login now')}</a>
             </div>
         </div>
         <div class="comment-button pull-right">
         ${h.reset('hide-inline-form', _('Hide'), class_='btn hide-inline-form')}
         </div>
         <div class="clearfix"></div>
         ${h.end_form()}
     %endif
     </div>
   </div>
 </%def>
 
 
 ## generates inlines taken from c.comments var
 <%def name="inlines(is_pull_request=False)">
     %if is_pull_request:
     <h2 id="comments">${ungettext("%d Pull Request Comment", "%d Pull Request Comments", len(c.comments)) % len(c.comments)}</h2>
     %else:
     <h2 id="comments">${ungettext("%d Commit Comment", "%d Commit Comments", len(c.comments)) % len(c.comments)}</h2>
     %endif
     %for path, lines_comments in c.inline_comments:
         % for line, comments in lines_comments.iteritems():
             <div style="display: none;" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
             ## for each comment in particular line
             %for comment in comments:
                 ${comment_block(comment, inline=True)}
             %endfor
             </div>
         %endfor
     %endfor
 
 </%def>
 
 ## generate inline comments and the main ones
 <%def name="generate_comments(include_pull_request=False, is_pull_request=False)">
     ## generate inlines for this changeset
      ${inlines(is_pull_request)}
 
     %for comment in c.comments:
         <div id="comment-tr-${comment.comment_id}">
           ## only render comments that are not from pull request, or from
           ## pull request and a status change
           %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
           ${comment_block(comment)}
           %endif
         </div>
     %endfor
     ## to anchor ajax comments
     <div id="injected_page_comments"></div>
 </%def>
 
 ## MAIN COMMENT FORM
 <%def name="comments(post_url, cur_status, is_pull_request=False, is_compare=False, change_status=True, form_extras=None)">
 %if is_compare:
   <% form_id = "comments_form_compare" %>
 %else:
   <% form_id = "comments_form" %>
 %endif
 
 
 %if is_pull_request:
 <div class="pull-request-merge">
     %if c.allowed_to_merge:
     <div class="pull-request-wrap">
         <div class="pull-right">
           ${h.secure_form(url('pullrequest_merge', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), id='merge_pull_request_form')}
           <span data-role="merge-message">${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
           <% merge_disabled = ' disabled' if c.pr_merge_status is False else '' %>
           <input type="submit" id="merge_pull_request" value="${_('Merge Pull Request')}" class="btn${merge_disabled}"${merge_disabled}>
           ${h.end_form()}
         </div>
     </div>
     %else:
     <div class="pull-request-wrap">
         <div class="pull-right">
           <span>${c.pr_merge_msg} ${c.approval_msg if c.approval_msg else ''}</span>
         </div>
     </div>
     %endif
 </div>
 %endif
 <div class="comments">
     %if c.rhodecode_user.username != h.DEFAULT_USER:
     <div class="comment-form ac">
         ${h.secure_form(post_url, id_=form_id)}
         <div id="edit-container" class="clearfix">
             <div class="comment-title pull-left">
               %if is_pull_request:
               ${(_('Create a comment on this Pull Request.'))}
               %elif is_compare:
               ${(_('Create comments on this Commit range.'))}
               %else:
               ${(_('Create a comment on this Commit.'))}
               %endif
             </div>
             <div class="comment-help pull-right">
               ${(_('Comments parsed using %s syntax with %s support.') % (
                      ('<a href="%s">%s</a>' % (h.url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper())),
                        ('<span  class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
                    )
                 )|n
                }
             </div>
              <div style="clear: both"></div>
              ${h.textarea('text', class_="comment-block-ta")}
         </div>
 
         <div id="preview-container" class="clearfix" style="display: none;">
            <div class="comment-title">
                 ${_('Comment preview')}
             </div>
             <div id="preview-box" class="preview-box"></div>
         </div>
 
         <div id="comment_form_extras">
         %if form_extras and isinstance(form_extras, (list, tuple)):
             % for form_ex_el in form_extras:
                 ${form_ex_el|n}
             % endfor
         %endif
         </div>
         <div class="comment-footer">
           %if change_status:
           <div class="status_box">
               <select id="change_status" name="changeset_status">
                   <option></option> # Placeholder
                   %for status,lbl in c.commit_statuses:
                   <option value="${status}" data-status="${status}">${lbl}</option>
                       %if is_pull_request and change_status and status in ('approved', 'rejected'):
                           <option value="${status}_closed" data-status="${status}">${lbl} & ${_('Closed')}</option>
                       %endif
                   %endfor
               </select>
           </div>
           %endif
           <div class="action-buttons">
               <button id="preview-btn" class="btn btn-secondary">${_('Preview')}</button>
               <button id="edit-btn" class="btn btn-secondary" style="display:none;">${_('Edit')}</button>
               <div class="comment-button">${h.submit('save', _('Comment'), class_="btn btn-success comment-button-input")}</div>
           </div>
         </div>
           ${h.end_form()}
     </div>
     %endif
 </div>
 <script>
     // init active elements of commentForm
     var commitId = templateContext.commit_data.commit_id;
     var pullRequestId = templateContext.pull_request_data.pull_request_id;
     var lineNo;
 
     var mainCommentForm = new CommentForm(
             "#${form_id}", commitId, pullRequestId, lineNo, true);
 
     mainCommentForm.initStatusChangeSelector();
 
 </script>
 </%def>

rhodecode/templates/compare/compare_diff.html

@@ -1,322 +1,322 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     %if c.compare_home:
         ${_('%s Compare') % c.repo_name}
     %else:
         ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.source_repo.repo_name, c.source_ref)} &gt; ${'%s@%s' % (c.target_repo.repo_name, c.target_ref)}
     %endif
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
   ${ungettext('%s commit','%s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='compare')}
 </%def>
 
 <%def name="main()">
 <script type="text/javascript">
     // set fake commitId on this commit-range page
     templateContext.commit_data.commit_id = "${h.EmptyCommit().raw_id}";
 </script>
 
     <div class="box">
         <div class="title">
             ${self.repo_page_title(c.rhodecode_db_repo)}
             <div class="breadcrumbs">
                 ${_('Compare Commits')}
             </div>
         </div>
 
         <div class="table">
             <div id="codeblock" class="diffblock">
                 <div class="code-header" >
                     <div class="compare_header">
                         ## The hidden elements are replaced with a select2 widget
                         <div class="compare-label">${_('Target')}</div>${h.hidden('compare_source')}
                         <div class="compare-label">${_('Source')}</div>${h.hidden('compare_target')}
 
                         %if not c.preview_mode:
                             <div class="compare-label"></div>
                             <div class="compare-buttons">
                                 %if not c.compare_home:
                                     <a id="btn-swap" class="btn btn-primary" href="${c.swap_url}"><i class="icon-refresh"></i> ${_('Swap')}</a>
                                 %endif
                                 <div id="compare_revs" class="btn btn-primary"><i class ="icon-loop"></i> ${_('Compare Commits')}</div>
                                 %if c.files:
                                     <div id="compare_changeset_status_toggle" class="btn btn-primary">${_('Comment')}</div>
                                 %endif
                             </div>
                         %endif
                     </div>
                 </div>
             </div>
             ## use JS script to load it quickly before potentially large diffs render long time
             ## this prevents from situation when large diffs block rendering of select2 fields
             <script type="text/javascript">
 
                 var cache = {};
 
                 var formatSelection = function(repoName){
                     return function(data, container, escapeMarkup) {
                         var selection = data ? this.text(data) : "";
                         return escapeMarkup('{0}@{1}'.format(repoName, selection));
                     }
                 };
 
                 var feedCompareData = function(query, cachedValue){
                     var data = {results: []};
                     //filter results
                     $.each(cachedValue.results, function() {
                         var section = this.text;
                         var children = [];
                         $.each(this.children, function() {
                             if (query.term.length === 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
                                 children.push({
                                     'id': this.id,
                                     'text': this.text,
                                     'type': this.type
                                 })
                             }
                         });
                         data.results.push({
                             'text': section,
                             'children': children
                         })
                     });
                     //push the typed in changeset
                     data.results.push({
-                        'text': _TM['specify commit'],
+                        'text': _gettext('specify commit'),
                         'children': [{
                             'id': query.term,
                             'text': query.term,
                             'type': 'rev'
                         }]
                     });
                     query.callback(data);
                 };
 
                 var loadCompareData = function(repoName, query, cache){
                     $.ajax({
                         url: pyroutes.url('repo_refs_data', {'repo_name': repoName}),
                         data: {},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                             cache[repoName] = data;
                             query.callback({results: data.results});
                         }
                     })
                 };
 
                 var enable_fields = ${"false" if c.preview_mode else "true"};
                 $("#compare_source").select2({
                     placeholder: "${'%s@%s' % (c.source_repo.repo_name, c.source_ref)}",
                     containerCssClass: "drop-menu",
                     dropdownCssClass: "drop-menu-dropdown",
                     formatSelection: formatSelection("${c.source_repo.repo_name}"),
                     dropdownAutoWidth: true,
                     query: function(query) {
                         var repoName = '${c.source_repo.repo_name}';
                         var cachedValue = cache[repoName];
 
                         if (cachedValue){
                             feedCompareData(query, cachedValue);
                         }
                         else {
                             loadCompareData(repoName, query, cache);
                         }
                     }
                 }).select2("enable", enable_fields);
 
                 $("#compare_target").select2({
                     placeholder: "${'%s@%s' % (c.target_repo.repo_name, c.target_ref)}",
                     dropdownAutoWidth: true,
                     containerCssClass: "drop-menu",
                     dropdownCssClass: "drop-menu-dropdown",
                     formatSelection: formatSelection("${c.target_repo.repo_name}"),
                     query: function(query) {
                         var repoName = '${c.target_repo.repo_name}';
                         var cachedValue = cache[repoName];
 
                         if (cachedValue){
                             feedCompareData(query, cachedValue);
                         }
                         else {
                             loadCompareData(repoName, query, cache);
                         }
                     }
                 }).select2("enable", enable_fields);
                 var initial_compare_source = {id: "${c.source_ref}", type:"${c.source_ref_type}"};
                 var initial_compare_target = {id: "${c.target_ref}", type:"${c.target_ref_type}"};
 
                 $('#compare_revs').on('click', function(e) {
                     var source = $('#compare_source').select2('data') || initial_compare_source;
                     var target = $('#compare_target').select2('data')  || initial_compare_target;
                     if (source && target) {
                         var url_data = {
                             repo_name: "${c.repo_name}",
                             source_ref: source.id,
                             source_ref_type: source.type,
                             target_ref: target.id,
                             target_ref_type: target.type
                         };
                         window.location = pyroutes.url('compare_url', url_data);
                     }
                 });
                 $('#compare_changeset_status_toggle').on('click', function(e) {
                     $('#compare_changeset_status').toggle();
                 });
 
             </script>
 
             ## changeset status form
             <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
             ## main comment form and it status
             <%
             def revs(_revs):
                 form_inputs = []
                 for cs in _revs:
                     tmpl = '<input type="hidden" data-commit-id="%(cid)s" name="commit_ids" value="%(cid)s">' % {'cid': cs.raw_id}
                     form_inputs.append(tmpl)
                 return form_inputs
             %>
             <div id="compare_changeset_status" style="display: none;">
                 ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision='0'*16), None, is_compare=True, form_extras=revs(c.commit_ranges))}
                 <script type="text/javascript">
 
                     mainCommentForm.setHandleFormSubmit(function(o) {
                         var text = mainCommentForm.cm.getValue();
                         var status = mainCommentForm.getCommentStatus();
 
                         if (text === "" && !status) {
                             return;
                         }
 
                         // we can pick which commits we want to make the comment by
                         // selecting them via click on preview pane, this will alter the hidden inputs
                         var cherryPicked = $('#changeset_compare_view_content .compare_select.hl').length > 0;
 
                         var commitIds = [];
                         $('#changeset_compare_view_content .compare_select').each(function(el) {
                             var commitId = this.id.replace('row-', '');
                             if ($(this).hasClass('hl') || !cherryPicked) {
                                 $("input[data-commit-id='{0}']".format(commitId)).val(commitId)
                                 commitIds.push(commitId);
                             } else {
                                 $("input[data-commit-id='{0}']".format(commitId)).val('')
                             }
                         });
 
                         mainCommentForm.setActionButtonsDisabled(true);
                         mainCommentForm.cm.setOption("readOnly", true);
                         var postData = {
                             'text': text,
                             'changeset_status': status,
                             'commit_ids': commitIds,
                             'csrf_token': CSRF_TOKEN
                         };
 
                         var submitSuccessCallback = function(o) {
                             location.reload(true);
                         };
                         var submitFailCallback = function(){
                             mainCommentForm.resetCommentFormState(text)
                         };
                         mainCommentForm.submitAjaxPOST(
                             mainCommentForm.submitUrl, postData, submitSuccessCallback, submitFailCallback);
                     });
                 </script>
 
             </div>
 
             %if c.compare_home:
                 <div id="changeset_compare_view_content">
                  <div class="help-block">${_('Compare commits, branches, bookmarks or tags.')}</div>
                 </div>
             %else:
                 <div id="changeset_compare_view_content">
                     ##CS
                     <%include file="compare_commits.html"/>
 
                     ## FILES
                   <div class="cs_files_title">
                     <span class="cs_files_expand">
                         <span id="expand_all_files">${_('Expand All')}</span> | <span id="collapse_all_files">${_('Collapse All')}</span>
                     </span>
                     <h2>
                         ${diff_block.diff_summary_text(len(c.files), c.lines_added, c.lines_deleted, c.limited_diff)}
                     </h2>
                   </div>
                     <div class="cs_files">
                       %if not c.files:
                          <p class="empty_data">${_('No files')}</p>
                       %endif
                   <table class="compare_view_files">
                   <%namespace name="diff_block" file="/changeset/diff_block.html"/>
                     %for FID, change, path, stats, file in c.files:
                     <tr class="cs_${change} collapse_file" fid="${FID}">
                         <td class="cs_icon_td">
                             <span class="collapse_file_icon" fid="${FID}"></span>
                         </td>
                         <td class="cs_icon_td">
                             <div class="flag_status not_reviewed hidden"></div>
                         </td>
                         <td class="cs_${change}" id="a_${FID}">
                             <div class="node">
                                 <a href="#a_${FID}">
                                     <i class="icon-file-${change.lower()}"></i>
                                     ${h.safe_unicode(path)}
                                 </a>
                             </div>
                         </td>
                         <td>
                             <div class="changes pull-right">${h.fancy_file_stats(stats)}</div>
                             <div class="comment-bubble pull-right" data-path="${path}">
                               <i class="icon-comment"></i>
                             </div>
                         </td>
                     </tr>
                     <tr fid="${FID}" id="diff_${FID}" class="diff_links">
                         <td></td>
                         <td></td>
                         <td class="cs_${change}">
                             %if c.target_repo.repo_name == c.repo_name:
                                 ${diff_block.diff_menu(c.repo_name, h.safe_unicode(path), c.source_ref, c.target_ref, change, file)}
                             %else:
                                 ## this is slightly different case later, since the target repo can have this
                                 ## file in target state than the source repo
                                 ${diff_block.diff_menu(c.target_repo.repo_name, h.safe_unicode(path), c.source_ref, c.target_ref, change, file)}
                             %endif
                         </td>
                         <td class="td-actions rc-form">
                         </td>
                     </tr>
                     <tr id="tr_${FID}">
                       <td></td>
                       <td></td>
                       <td class="injected_diff" colspan="2">
                           ${diff_block.diff_block_simple([c.changes[FID]])}
                       </td>
                     </tr>
                   %endfor
                   </table>
                     % if c.limited_diff:
                         ${diff_block.changeset_message()}
                     % endif
                  </div>
             %endif
         </div>
     </div>
 </div>
 </%def>

rhodecode/templates/debug_style/collapsable-content.html

@@ -1,967 +1,967 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/debug_style/index.html"/>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Style'), h.url('debug_style_home'))}
     &raquo;
     ${c.active}
 </%def>
 
 
 <%def name="real_main()">
 <div class="box">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
 
     <div class='sidebar-col-wrapper'>
     ${self.sidebar()}
 
       <div class="main-content">
 
         <h2>Collapsable Content</h2>
         <p>Where a section may have a very long list of information, it can be desirable to use collapsable content. There is a premade function for showing/hiding elements, though its use may or may not be practical, depending on the situation. Use it, or don't, on a case-by-case basis.</p>
 
         <p><strong>To use the collapsable-content function:</strong> Create a toggle button using <code>&lt;div class="btn-collapse"&gt;Show More&lt;/div&gt;</code> and a data attribute using <code>data-toggle</code>. Clicking this button will toggle any sibling element(s) containing the class <code>collapsable-content</code> and an identical <code>data-toggle</code> attribute. It will also change the button to read "Show Less"; another click toggles it back to the previous state. Ideally, use pre-existing elements and add the class and attribute; creating a new div around the existing content may lead to unexpected results, as the toggle function will use <code>display:block</code> if no previous display specification was found.
         </p>
         <p>Notes:</p>
         <ul>
           <li>Changes made to the text of the button will require adjustment to the function, but for the sake of consistency and user experience, this is best avoided. </li>
           <li>Collapsable content inside of a pjax loaded container will require <code>collapsableContent();</code> to be called from within the container. No variables are necessary.</li>
         </ul>
 
       </div>  <!-- .main-content  -->
     </div>  <!-- .sidebar-col-wrapper  -->
 </div> <!-- .box -->
 
   <!-- CONTENT -->
   <div id="content" class="wrapper">
 
       <div class="main">
 
 <div class="box">
   <div class="title">
     <h1>
         Diff: enable filename with spaces on diffs
     </h1>
     <h1>
             <i class="icon-hg" ></i>
 
             <i class="icon-lock"></i>
         <span><a href="/rhodecode-momentum">rhodecode-momentum</a></span>
 
     </h1>
   </div>
 
   <div class="box pr-summary">
       <div class="summary-details block-left">
 
         <div class="pr-details-title">
 
     Pull request #720 From Tue, 17 Feb 2015 16:21:38
 <div class="btn-collapse" data-toggle="description">Show More</div>
         </div>
         <div id="summary" class="fields pr-details-content">
            <div class="field">
             <div class="label-summary">
                 <label>Origin:</label>
             </div>
             <div class="input">
                 <div>
                     <span class="tag">
                         <a href="/andersonsantos/rhodecode-momentum-fork#fix_574">book: fix_574</a>
                     </span>
                     <span class="clone-url">
                         <a href="/andersonsantos/rhodecode-momentum-fork">https://code.rhodecode.com/andersonsantos/rhodecode-momentum-fork</a>
                     </span>
                 </div>
                 <div>
                      <br>
                         <input type="text"  value="hg pull -r 46b3d50315f0 https://code.rhodecode.com/andersonsantos/rhodecode-momentum-fork" readonly="readonly">
                 </div>
             </div>
            </div>
            <div class="field">
             <div class="label-summary">
                 <label>Review:</label>
             </div>
             <div class="input">
               <div class="flag_status under_review tooltip pull-left" title="Pull request status calculated from votes"></div>
                 <span class="changeset-status-lbl tooltip" title="Pull request status calculated from votes">
                   Under Review
                 </span>
 
             </div>
            </div>
             <div class="field collapsable-content" data-toggle="description">
              <div class="label-summary">
                  <label>Description:</label>
              </div>
              <div class="input">
                  <div class="pr-description">Fixing issue <a class="issue- tracker-link" href="http://bugs.rhodecode.com/issues/574">#  574</a>, changing regex for capturing filenames</div>
              </div>
             </div>
             <div class="field collapsable-content" data-toggle="description">
              <div class="label-summary">
                  <label>Comments:</label>
              </div>
              <div class="input">
                  <div>
                      <div class="comments-number">
                          <a href="#inline-comments-container">0 Pull request   comments</a>,
                          0 Inline Comments
                      </div>
                  </div>
               </div>
           </div>
         </div>
       </div>
       <div>
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
               Author
           </div>
         </div>
         <div class="block-right pr-details-content reviewers">
             <ul class="group_members">
               <li>
                 <img class="gravatar" src="https://secure.gravatar.com/avatar/72706ebd30734451af9ff3fb59f05ff1?d=identicon&amp;s=32" height="16" width="16">
                 <span class="user"> <a href="/_profiles/lolek">lolek (Lolek Santos)</a></span>
               </li>
             </ul>
         </div>
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
               Pull request reviewers
               <span class="btn-collapse" data-toggle="reviewers">Show More</span>
           </div>
 
         </div>
         <div id="reviewers" class="block-right pr-details-content reviewers">
 
             <ul id="review_members" class="group_members">
               <li id="reviewer_70">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status rejected pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/153a0fab13160b3e64a2cbc7c0373506?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">jenkins-tests</a> (reviewer)</span>
                 </div>
                   <input id="reviewer_70_input" type="hidden" value="70" name="review_members">
                   <div class="reviewer_member_remove action_button" onclick="removeReviewMember(70, true)" style="visibility: hidden;">
                     <i class="icon-remove-sign"></i>
                   </div>
               </li>
               <li id="reviewer_33" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status approved pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/ffd6a317ec2b66be880143cd8459d0d9?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">garbas (Rok Garbas)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_2" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status not_reviewed pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/aad9d40cac1259ea39b5578554ad9d64?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">marcink (Marcin Kuzminski)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_36" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status approved pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/7a4da001a0af0016ed056ab523255db9?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">johbo (Johannes Bornhold)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_47" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status under_review pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/8f6dc00dce79d6bd7d415be5cea6a008?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">lisaq (Lisa Quatmann)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_49" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status approved pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/89f722927932a8f737a0feafb03a606e?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">paris (Paris Kolios)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_50" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status approved pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/081322c975e8545ec269372405fbd016?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">ergo (Marcin Lulek)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_54" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status under_review pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/72706ebd30734451af9ff3fb59f05ff1?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">anderson (Anderson Santos)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_57" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status approved pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/23e2ee8f5fd462cba8129a40cc1e896c?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">gmgauthier (Greg Gauthier)</a> (reviewer)</span>
                 </div>
               </li>
               <li id="reviewer_31" class="collapsable-content" data-toggle="reviewers">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip pull-left" title="Not Reviewed">
                       <div class="flag_status under_review pull-left reviewer_member_status"></div>
                     </div>
                   <img class="gravatar" src="https://secure.gravatar.com/avatar/0c9a7e6674b6f0b35d98dbe073e3f0ab?d=identicon&amp;s=32" height="16" width="16">
                   <span class="user"> <a href="/_profiles/jenkins-tests">ostrobel (Oliver Strobel)</a> (reviewer)</span>
                 </div>
               </li>
             </ul>
           <div id="add_reviewer_input" class="ac" style="display: none;">
           </div>
         </div>
         </div>
       </div>
   </div>
   <div class="box">
       <div class="table" >
           <div id="changeset_compare_view_content">
               <div class="compare_view_commits_title">
                   <h2>Compare View: 6 commits<span class="btn-collapse" data-toggle="commits">Show More</span></h2>
 
               </div>
               <div class="container">
 
 
     <table class="rctable compare_view_commits">
     <tr>
         <th>Time</th>
         <th>Author</th>
         <th>Commit</th>
         <th></th>
         <th>Title</th>
     </tr>
         <tr id="row-7e83e5cd7812dd9e055ce30e77c65cdc08154b43" commit_id="7e83e5cd7812dd9e055ce30e77c65cdc08154b43" class="compare_select">
             <td class="td-time">
                 <span class="tooltip" title="3 hours and 23 minutes ago" tt_title="3 hours and 23 minutes ago">2015-02-18 10:13:34</span>
             </td>
             <td class="td-user">
                 <div class="gravatar_with_user">
                     <img class="gravatar" alt="gravatar" src="https://secure.gravatar.com/avatar/02cc31cea73b88b7209ba302c5967a9d?d=identicon&amp;s=16">
                     <span title="Lolek Santos <[e-mail]>" class="user">brian (Brian Butler)</span>
                 </div>
             </td>
             <td class="td-hash">
                 <code>
                     <a href="/brian/documentation-rep/changeset/7e83e5cd7812dd9e055ce30e77c65cdc08154b43">r395:7e83e5cd7812</a>
                 </code>
             </td>
             <td class="expand_commit" data-commit-id="7e83e5cd7812dd9e055ce30e77c65cdc08154b43" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more"></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-7e83e5cd7812dd9e055ce30e77c65cdc08154b43" class="message truncate">rep: added how we doc to guide</div>
                   </div>
             </td>
         </tr>
         <tr id="row-48ce1581bdb3aa7679c246cbdd3fb030623f5c87" commit_id="48ce1581bdb3aa7679c246cbdd3fb030623f5c87" class="compare_select">
             <td class="td-time">
                 <span class="tooltip" title="4 hours and 18 minutes ago">2015-02-18 09:18:31</span>
             </td>
             <td class="td-user">
                 <div class="gravatar_with_user">
                     <img class="gravatar" alt="gravatar" src="https://secure.gravatar.com/avatar/02cc31cea73b88b7209ba302c5967a9d?d=identicon&amp;s=16">
                     <span title="Lolek Santos <[e-mail]>" class="user">brian (Brian Butler)</span>
                 </div>
             </td>
             <td class="td-hash">
                 <code>
                     <a href="/brian/documentation-rep/changeset/48ce1581bdb3aa7679c246cbdd3fb030623f5c87">r394:48ce1581bdb3</a>
                 </code>
             </td>
             <td class="expand_commit" data-commit-id="48ce1581bdb3aa7679c246cbdd3fb030623f5c87" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more"></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-48ce1581bdb3aa7679c246cbdd3fb030623f5c87" class="message truncate">repo 0004 - typo</div>
                   </div>
             </td>
         </tr>
         <tr id="row-982d857aafb4c71e7686e419c32b71c9a837257d" commit_id="982d857aafb4c71e7686e419c32b71c9a837257d" class="compare_select collapsable-content" data-toggle="commits">
             <td class="td-time">
                 <span class="tooltip" title="4 hours and 22 minutes ago">2015-02-18 09:14:45</span>
             </td>
             <td class="td-user">
                 <span class="gravatar" commit_id="982d857aafb4c71e7686e419c32b71c9a837257d">
                     <img alt="gravatar" src="https://secure.gravatar.com/avatar/02cc31cea73b88b7209ba302c5967a9d?d=identicon&amp;s=28" height="14" width="14">
                 </span>
                 <span class="author">brian (Brian Butler)</span>
             </td>
             <td class="td-hash">
                 <code>
                     <a href="/brian/documentation-rep/changeset/982d857aafb4c71e7686e419c32b71c9a837257d">r393:982d857aafb4</a>
                 </code>
             </td>
             <td class="expand_commit" data-commit-id="982d857aafb4c71e7686e419c32b71c9a837257d" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more"></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-982d857aafb4c71e7686e419c32b71c9a837257d" class="message truncate">internals: how to doc section added</div>
                   </div>
             </td>
         </tr>
         <tr id="row-4c7258ad1af6dae91bbaf87a933e3597e676fab8" commit_id="4c7258ad1af6dae91bbaf87a933e3597e676fab8" class="compare_select collapsable-content" data-toggle="commits">
             <td class="td-time">
                 <span class="tooltip" title="20 hours and 16 minutes ago">2015-02-17 17:20:44</span>
             </td>
             <td class="td-user">
                 <span class="gravatar" commit_id="4c7258ad1af6dae91bbaf87a933e3597e676fab8">
                     <img alt="gravatar" src="https://secure.gravatar.com/avatar/02cc31cea73b88b7209ba302c5967a9d?d=identicon&amp;s=28" height="14" width="14">
                 </span>
                 <span class="author">brian (Brian Butler)</span>
             </td>
             <td class="td-hash">
                 <code>
                     <a href="/brian/documentation-rep/changeset/4c7258ad1af6dae91bbaf87a933e3597e676fab8">r392:4c7258ad1af6</a>
                 </code>
             </td>
             <td class="expand_commit" data-commit-id="4c7258ad1af6dae91bbaf87a933e3597e676fab8" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more"></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-4c7258ad1af6dae91bbaf87a933e3597e676fab8" class="message truncate">REP: 0004 Documentation standards</div>
                   </div>
             </td>
         </tr>
         <tr id="row-46b3d50315f0f2b1f64485ac95af4f384948f9cb" commit_id="46b3d50315f0f2b1f64485ac95af4f384948f9cb" class="compare_select collapsable-content" data-toggle="commits">
             <td class="td-time">
                 <span class="tooltip" title="18 hours and 19 minutes ago">2015-02-17 16:18:49</span>
             </td>
             <td class="td-user">
                 <span class="gravatar" commit_id="46b3d50315f0f2b1f64485ac95af4f384948f9cb">
                     <img alt="gravatar" src="https://secure.gravatar.com/avatar/72706ebd30734451af9ff3fb59f05ff1?d=identicon&amp;s=28" height="14" width="14">
                 </span>
                 <span class="author">anderson (Anderson Santos)</span>
             </td>
             <td class="td-hash">
                 <code>
                     <a href="/andersonsantos/rhodecode-momentum-fork/changeset/46b3d50315f0f2b1f64485ac95af4f384948f9cb">r8743:46b3d50315f0</a>
                 </code>
             </td>
             <td class="expand_commit" data-commit-id="46b3d50315f0f2b1f64485ac95af4f384948f9cb" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more" ></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-46b3d50315f0f2b1f64485ac95af4f384948f9cb" class="message truncate">Diff: created tests for the diff with filenames with spaces</div>
                     
                   </div>
             </td>
         </tr>
         <tr id="row-1e57d2549bd6c34798075bf05ac39f708bb33b90" commit_id="1e57d2549bd6c34798075bf05ac39f708bb33b90" class="compare_select collapsable-content" data-toggle="commits">
             <td class="td-time">
                 <span class="tooltip" title="2 days ago">2015-02-16 10:06:08</span>
             </td>
             <td class="td-user">
                 <span class="gravatar" commit_id="1e57d2549bd6c34798075bf05ac39f708bb33b90">
                     <img alt="gravatar" src="https://secure.gravatar.com/avatar/72706ebd30734451af9ff3fb59f05ff1?d=identicon&amp;s=28" height="14" width="14">
                 </span>
                 <span class="author">anderson (Anderson Santos)</span>
             </td>
             <td class="td-hash">
                 <code>
                     <a href="/andersonsantos/rhodecode-momentum-fork/changeset/1e57d2549bd6c34798075bf05ac39f708bb33b90">r8742:1e57d2549bd6</a>
                 </code>
             </td>
             <td class="expand_commit" data-commit-id="1e57d2549bd6c34798075bf05ac39f708bb33b90" title="Expand commit message">
                 <div class="show_more_col">
                 <i class="show_more" ></i>
                 </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div id="c-1e57d2549bd6c34798075bf05ac39f708bb33b90" class="message truncate">Diff: fix renaming files with spaces <a class="issue-tracker-link" href="http://bugs.rhodecode.com/issues/574">#574</a></div>
                     
                   </div>
             </td>
         </tr>
     </table>
 </div>
 
 <script>
 $('.expand_commit').on('click',function(e){
     $(this).children('i').hide();
     var cid = $(this).data('commitId');
     $('#c-'+cid).css({'height': 'auto', 'margin': '.65em 1em .65em 0','white-space': 'pre-line', 'text-overflow': 'initial', 'overflow':'visible'})
     $('#t-'+cid).css({'height': 'auto', 'text-overflow': 'initial', 'overflow':'visible', 'white-space':'normal'})
 });
 $('.compare_select').on('click',function(e){
     var cid = $(this).attr('commit_id');
     $('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));
 });
 </script>
               <div class="cs_files_title">
                   <span class="cs_files_expand">
                       <span id="expand_all_files">Expand All</span> | <span id="collapse_all_files">Collapse All</span>
                   </span>
                   <h2>
                       7 files changed: 55 inserted, 9 deleted
                   </h2>
               </div>
               <div class="cs_files">
               <table class="compare_view_files">
 
                   <tr class="cs_A expand_file" fid="c--efbe5b7a3f13">
                       <td class="cs_icon_td">
                           <span class="expand_file_icon" fid="c--efbe5b7a3f13"></span>
                       </td>
                       <td class="cs_icon_td">
                           <div class="flag_status not_reviewed hidden"></div>
                       </td>
                       <td id="a_c--efbe5b7a3f13">
                           <a class="compare_view_filepath" href="#a_c--efbe5b7a3f13">
                               rhodecode/tests/fixtures/git_diff_rename_file_with_spaces.diff
                           </a>
                           <span id="diff_c--efbe5b7a3f13" class="diff_links" style="display: none;">
                             <a href="/andersonsantos/rhodecode-momentum-fork/diff/rhodecode/tests/fixtures/git_diff_rename_file_with_spaces.diff?diff2=46b3d50315f0f2b1f64485ac95af4f384948f9cb&amp;diff1=b78e2376b986b2cf656a2b4390b09f303291c886&amp;fulldiff=1&amp;diff=diff">
                                 Unified Diff
                             </a>
                             |
                             <a href="/andersonsantos/rhodecode-momentum-fork/diff-2way/rhodecode/tests/fixtures/git_diff_rename_file_with_spaces.diff?diff2=46b3d50315f0f2b1f64485ac95af4f384948f9cb&amp;diff1=b78e2376b986b2cf656a2b4390b09f303291c886&amp;fulldiff=1&amp;diff=diff">
                                 Side-by-side Diff
                             </a>
                           </span>
                       </td>
                       <td>
                           <div class="changes pull-right"><div style="width:100px"><div class="added top-right-rounded-corner-mid bottom-right-rounded-corner-mid top-left-rounded-corner-mid bottom-left-rounded-corner-mid" style="width:100.0%">4</div><div class="deleted top-right-rounded-corner-mid bottom-right-rounded-corner-mid" style="width:0%"></div></div></div>
                           <div class="comment-bubble pull-right" data-path="rhodecode/tests/fixtures/git_diff_rename_file_with_spaces.diff">
                             <i class="icon-comment"></i>
                           </div>
                       </td>
                   </tr>
                   <tr id="tr_c--efbe5b7a3f13">
                     <td></td>
                     <td></td>
                     <td class="injected_diff" colspan="2">
 
  <div class="diff-container" id="diff-container-140716195039928">
     <div id="c--efbe5b7a3f13_target" ></div>
     <div id="c--efbe5b7a3f13" class="diffblock margined comm" >
         <div class="code-body">
             <div class="full_f_path" path="rhodecode/tests/fixtures/git_diff_rename_file_with_spaces.diff" style="display: none;"></div>
             <table class="code-difftable">
 <tr class="line context">
     <td class="add-comment-line"><span class="add-comment-content"></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_o"></a></td>
     <td  class="lineno new"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n"></a></td>
     <td class="code no-comment">
         <pre>new file 100644</pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n1" class="lineno new"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n1">1</a></td>
     <td class="code">
         <pre>diff --git a/file_with_ spaces.txt b/file_with_  two spaces.txt
 </pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n2" class="lineno new"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n2">2</a></td>
     <td class="code">
         <pre>similarity index 100%
 </pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n3" class="lineno new"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n3">3</a></td>
     <td class="code">
         <pre>rename from file_with_ spaces.txt
 </pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n4" class="lineno new"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n4">4</a></td>
     <td class="code">
         <pre>rename to file_with_  two spaces.txt
 </pre>
     </td>
 </tr>
 <tr class="line context">
     <td class="add-comment-line"><span class="add-comment-content"></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_o...">...</a></td>
     <td  class="lineno new"><a href="#rhodecodetestsfixturesgit_diff_rename_file_with_spacesdiff_n...">...</a></td>
     <td class="code no-comment">
         <pre> No newline at end of file</pre>
     </td>
 </tr>
 </table>
         </div>
     </div>
   </div>
 
                     </td>
                   </tr>
                   <tr class="cs_A expand_file" fid="c--c21377f778f9">
                       <td class="cs_icon_td">
                           <span class="expand_file_icon" fid="c--c21377f778f9"></span>
                       </td>
                       <td class="cs_icon_td">
                           <div class="flag_status not_reviewed hidden"></div>
                       </td>
                       <td id="a_c--c21377f778f9">
                           <a class="compare_view_filepath" href="#a_c--c21377f778f9">
                               rhodecode/tests/fixtures/hg_diff_copy_file_with_spaces.diff
                           </a>
                           <span id="diff_c--c21377f778f9" class="diff_links" style="display: none;">
                             <a href="/andersonsantos/rhodecode-momentum-fork/diff/rhodecode/tests/fixtures/hg_diff_copy_file_with_spaces.diff?diff2=46b3d50315f0f2b1f64485ac95af4f384948f9cb&amp;diff1=b78e2376b986b2cf656a2b4390b09f303291c886&amp;fulldiff=1&amp;diff=diff">
                                 Unified Diff
                             </a>
                             |
                             <a href="/andersonsantos/rhodecode-momentum-fork/diff-2way/rhodecode/tests/fixtures/hg_diff_copy_file_with_spaces.diff?diff2=46b3d50315f0f2b1f64485ac95af4f384948f9cb&amp;diff1=b78e2376b986b2cf656a2b4390b09f303291c886&amp;fulldiff=1&amp;diff=diff">
                                 Side-by-side Diff
                             </a>
                           </span>
                       </td>
                       <td>
                           <div class="changes pull-right"><div style="width:100px"><div class="added top-right-rounded-corner-mid bottom-right-rounded-corner-mid top-left-rounded-corner-mid bottom-left-rounded-corner-mid" style="width:100.0%">3</div><div class="deleted top-right-rounded-corner-mid bottom-right-rounded-corner-mid" style="width:0%"></div></div></div>
                           <div class="comment-bubble pull-right" data-path="rhodecode/tests/fixtures/hg_diff_copy_file_with_spaces.diff">
                             <i class="icon-comment"></i>
                           </div>
                       </td>
                   </tr>
                   <tr id="tr_c--c21377f778f9">
                     <td></td>
                     <td></td>
                     <td class="injected_diff" colspan="2">
 
  <div class="diff-container" id="diff-container-140716195038344">
     <div id="c--c21377f778f9_target" ></div>
     <div id="c--c21377f778f9" class="diffblock margined comm" >
         <div class="code-body">
             <div class="full_f_path" path="rhodecode/tests/fixtures/hg_diff_copy_file_with_spaces.diff" style="display: none;"></div>
             <table class="code-difftable">
 <tr class="line context">
     <td class="add-comment-line"><span class="add-comment-content"></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_o"></a></td>
     <td  class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n"></a></td>
     <td class="code no-comment">
         <pre>new file 100644</pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n1" class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n1">1</a></td>
     <td class="code">
         <pre>diff --git a/file_changed_without_spaces.txt b/file_copied_ with  spaces.txt
 </pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n2" class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n2">2</a></td>
     <td class="code">
         <pre>copy from file_changed_without_spaces.txt
 </pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n3" class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n3">3</a></td>
     <td class="code">
         <pre>copy to file_copied_ with  spaces.txt
 </pre>
     </td>
 </tr>
 <tr class="line context">
     <td class="add-comment-line"><span class="add-comment-content"></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_o...">...</a></td>
     <td  class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_copy_file_with_spacesdiff_n...">...</a></td>
     <td class="code no-comment">
         <pre> No newline at end of file</pre>
     </td>
 </tr>
 </table>
         </div>
     </div>
   </div>
 
                     </td>
                   </tr>
                   <tr class="cs_A expand_file" fid="c--ee62085ad7a8">
                       <td class="cs_icon_td">
                           <span class="expand_file_icon" fid="c--ee62085ad7a8"></span>
                       </td>
                       <td class="cs_icon_td">
                           <div class="flag_status not_reviewed hidden"></div>
                       </td>
                       <td id="a_c--ee62085ad7a8">
                           <a class="compare_view_filepath" href="#a_c--ee62085ad7a8">
                               rhodecode/tests/fixtures/hg_diff_rename_file_with_spaces.diff
                           </a>
                           <span id="diff_c--ee62085ad7a8" class="diff_links" style="display: none;">
                             <a href="/andersonsantos/rhodecode-momentum-fork/diff/rhodecode/tests/fixtures/hg_diff_rename_file_with_spaces.diff?diff2=46b3d50315f0f2b1f64485ac95af4f384948f9cb&amp;diff1=b78e2376b986b2cf656a2b4390b09f303291c886&amp;fulldiff=1&amp;diff=diff">
                                 Unified Diff
                             </a>
                             |
                             <a href="/andersonsantos/rhodecode-momentum-fork/diff-2way/rhodecode/tests/fixtures/hg_diff_rename_file_with_spaces.diff?diff2=46b3d50315f0f2b1f64485ac95af4f384948f9cb&amp;diff1=b78e2376b986b2cf656a2b4390b09f303291c886&amp;fulldiff=1&amp;diff=diff">
                                 Side-by-side Diff
                             </a>
                           </span>
                       </td>
                       <td>
                           <div class="changes pull-right"><div style="width:100px"><div class="added top-right-rounded-corner-mid bottom-right-rounded-corner-mid top-left-rounded-corner-mid bottom-left-rounded-corner-mid" style="width:100.0%">3</div><div class="deleted top-right-rounded-corner-mid bottom-right-rounded-corner-mid" style="width:0%"></div></div></div>
                           <div class="comment-bubble pull-right" data-path="rhodecode/tests/fixtures/hg_diff_rename_file_with_spaces.diff">
                             <i class="icon-comment"></i>
                           </div>
                       </td>
                   </tr>
                   <tr id="tr_c--ee62085ad7a8">
                     <td></td>
                     <td></td>
                     <td class="injected_diff" colspan="2">
 
  <div class="diff-container" id="diff-container-140716195039496">
     <div id="c--ee62085ad7a8_target" ></div>
     <div id="c--ee62085ad7a8" class="diffblock margined comm" >
         <div class="code-body">
             <div class="full_f_path" path="rhodecode/tests/fixtures/hg_diff_rename_file_with_spaces.diff" style="display: none;"></div>
             <table class="code-difftable">
 <tr class="line context">
     <td class="add-comment-line"><span class="add-comment-content"></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_o"></a></td>
     <td  class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_n"></a></td>
     <td class="code no-comment">
         <pre>new file 100644</pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_n1" class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_n1">1</a></td>
     <td class="code">
         <pre>diff --git a/file_ with update.txt b/file_changed _.txt
 </pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_n2" class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_n2">2</a></td>
     <td class="code">
         <pre>rename from file_ with update.txt
 </pre>
     </td>
 </tr>
 <tr class="line add">
     <td class="add-comment-line"><span class="add-comment-content"><a href="#"><span class="icon-comment-add"></span></a></span></td>
     <td  class="lineno old"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_o"></a></td>
     <td id="rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_n3" class="lineno new"><a href="#rhodecodetestsfixtureshg_diff_rename_file_with_spacesdiff_n3">3</a></td>
     <td class="code">
         <pre>rename to file_changed _.txt</pre>
     </td>
 </tr>
 </table>
         </div>
     </div>
   </div>
 
                     </td>
                   </tr>
 
 </table>
         </div>
     </div>
   </div>
 
                     </td>
                   </tr>
               </table>
               </div>
           </div>
       </div>
 
 
 
 
 <div id="comment-inline-form-template" style="display: none;">
   <div class="comment-inline-form ac">
     <div class="overlay"><div class="overlay-text">Submitting...</div></div>
       <form action="#" class="inline-form" method="get">
       <div id="edit-container_{1}" class="clearfix">
         <div class="comment-title pull-left">
           Commenting on line {1}.
         </div>
         <div class="comment-help pull-right">
           Comments parsed using <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html">RST</a> syntax with <span  class="tooltip" title="Use @username inside this text to send notification to this RhodeCode user">@mention</span> support.
         </div>
             <div style="clear: both"></div>
             <textarea id="text_{1}" name="text" class="comment-block-ta ac-input"></textarea>
       </div>
       <div id="preview-container_{1}" class="clearfix" style="display: none;">
          <div class="comment-help">
               Comment preview
           </div>
           <div id="preview-box_{1}" class="preview-box"></div>
       </div>
       <div class="comment-button pull-right">
         <input type="hidden" name="f_path" value="{0}">
         <input type="hidden" name="line" value="{1}">
         <div id="preview-btn_{1}" class="btn btn-default">Preview</div>
         <div id="edit-btn_{1}" class="btn" style="display: none;">Edit</div>
         <input class="btn btn-success save-inline-form" id="save" name="save" type="submit" value="Comment" />
       </div>
       <div class="comment-button hide-inline-form-button">
       <input class="btn hide-inline-form" id="hide-inline-form" name="hide-inline-form" type="reset" value="Cancel" />
       </div>
       </form>
   </div>
 </div>
 
 
 
 <div class="comments">
     <div id="inline-comments-container">
 
     <h2>0 Pull Request Comments</h2>
 
 
     </div>
 
 </div>
 
 
 
 
 <div class="pull-request-merge">
 </div>
 <div class="comments">
     <div class="comment-form ac">
         <form action="/rhodecode-momentum/pull-request-comment/720" id="comments_form" method="POST">
 <div style="display: none;"><input id="csrf_token" name="csrf_token" type="hidden" value="6dbc0b19ac65237df65d57202a3e1f2df4153e38" /></div>
         <div id="edit-container" class="clearfix">
             <div class="comment-title pull-left">
               Create a comment on this Pull Request.
             </div>
             <div class="comment-help pull-right">
               Comments parsed using <a href="http://docutils.sourceforge.net/docs/user/rst/quickref.html">RST</a> syntax with <span  class="tooltip" title="Use @username inside this text to send notification to this RhodeCode user">@mention</span> support.
             </div>
              <div style="clear: both"></div>
              <textarea class="comment-block-ta" id="text" name="text"></textarea>
         </div>
 
         <div id="preview-container" class="clearfix" style="display: none;">
            <div class="comment-title">
                 Comment preview
             </div>
             <div id="preview-box" class="preview-box"></div>
         </div>
 
         <div id="comment_form_extras">
         </div>
         <div class="action-button pull-right">
             <div id="preview-btn" class="btn">
                 Preview
             </div>
             <div id="edit-btn" class="btn" style="display: none;">
                 Edit
             </div>
             <div class="comment-button">
                 <input class="btn btn-small btn-success comment-button-input" id="save" name="save" type="submit" value="Comment" />
             </div>
         </div>
         </form>
     </div>
 </div>
 <script>
 
 $(document).ready(function() {
 
     var cm = initCommentBoxCodeMirror('#text');
 
     // main form preview
     $('#preview-btn').on('click', function(e) {
         $('#preview-btn').hide();
         $('#edit-btn').show();
         var _text = cm.getValue();
         if (!_text) {
             return;
         }
         var post_data = {
             'text': _text,
             'renderer': DEFAULT_RENDERER,
             'csrf_token': CSRF_TOKEN
         };
         var previewbox = $('#preview-box');
         previewbox.addClass('unloaded');
-        previewbox.html(_TM['Loading ...']);
+        previewbox.html(_gettext('Loading ...'));
         $('#edit-container').hide();
         $('#preview-container').show();
 
         var url = pyroutes.url('changeset_comment_preview', {'repo_name': 'rhodecode-momentum'});
 
         ajaxPOST(url, post_data, function(o) {
             previewbox.html(o);
             previewbox.removeClass('unloaded');
         });
     });
     $('#edit-btn').on('click', function(e) {
         $('#preview-btn').show();
         $('#edit-btn').hide();
         $('#edit-container').show();
         $('#preview-container').hide();
     });
 
     var formatChangeStatus = function(state, escapeMarkup) {
         var originalOption = state.element;
         return '<div class="flag_status ' + $(originalOption).data('status') + ' pull-left"></div>' +
                '<span>' + escapeMarkup(state.text) + '</span>';
     };
 
     var formatResult = function(result, container, query, escapeMarkup) {
         return formatChangeStatus(result, escapeMarkup);
     };
 
     var formatSelection = function(data, container, escapeMarkup) {
         return formatChangeStatus(data, escapeMarkup);
     };
 
     $('#change_status').select2({
         placeholder: "Status Review",
         formatResult: formatResult,
         formatSelection: formatSelection,
         containerCssClass: "drop-menu status_box_menu",
         dropdownCssClass: "drop-menu-dropdown",
         dropdownAutoWidth: true,
         minimumResultsForSearch: -1
     });
 });
 </script>
 
 
       <script type="text/javascript">
         // TODO: switch this to pyroutes
         AJAX_COMMENT_DELETE_URL = "/rhodecode-momentum/pull-request-comment/__COMMENT_ID__/delete";
 
         $(function(){
             ReviewerAutoComplete('user');
 
             $('#open_edit_reviewers').on('click', function(e){
                 $('#open_edit_reviewers').hide();
                 $('#close_edit_reviewers').show();
                 $('#add_reviewer_input').show();
                 $('.reviewer_member_remove').css('visibility', 'visible');
             });
 
             $('#close_edit_reviewers').on('click', function(e){
                 $('#open_edit_reviewers').show();
                 $('#close_edit_reviewers').hide();
                 $('#add_reviewer_input').hide();
                 $('.reviewer_member_remove').css('visibility', 'hidden');
             });
 
             $('.show-inline-comments').on('change', function(e){
                 var show = 'none';
                 var target = e.currentTarget;
                 if(target.checked){
                     show = ''
                 }
                 var boxid = $(target).attr('id_for');
                 var comments = $('#{0} .inline-comments'.format(boxid));
                 var fn_display = function(idx){
                    $(this).css('display', show);
                 };
                 $(comments).each(fn_display);
                 var btns = $('#{0} .inline-comments-button'.format(boxid));
                 $(btns).each(fn_display);
             });
 
             // inject comments into they proper positions
             var file_comments = $('.inline-comment-placeholder');
             renderInlineComments(file_comments);
             var commentTotals = {};
             $.each(file_comments, function(i, comment) {
                 var path = $(comment).attr('path');
                 var comms = $(comment).children().length;
                 if (path in commentTotals) {
                     commentTotals[path] += comms;
                 } else {
                     commentTotals[path] = comms;
                 }
             });
             $.each(commentTotals, function(path, total) {
                 var elem = $('.comment-bubble[data-path="'+ path +'"]')
                 elem.css('visibility', 'visible');
                 elem.html(elem.html() + ' ' + total );
             });
 
             $('#merge_pull_request_form').submit(function() {
                 if (!$('#merge_pull_request').attr('disabled')) {
                     $('#merge_pull_request').attr('disabled', 'disabled');
                 }
                 return true;
             });
 
             $('#update_pull_request').on('click', function(e){
                 updateReviewers(undefined, "rhodecode-momentum", "720");
             });
 
             $('#update_commits').on('click', function(e){
                 updateCommits("rhodecode-momentum", "720");
             });
 
             $('#close_pull_request').on('click', function(e){
                 closePullRequest("rhodecode-momentum", "720");
             });
         })
       </script>
 
   </div>
 </div></div>
 
 </div>
 
 
 </%def>

rhodecode/templates/files/files.html

@@ -1,336 +1,336 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title(*args)">
     ${_('%s Files') % c.repo_name}
     %if hasattr(c,'file'):
         &middot; ${h.safe_unicode(c.file.path) or '\\'}
     %endif
 
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Files')}
     %if c.file:
         @ ${h.show_id(c.commit)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
     <div class="title">
         ${self.repo_page_title(c.rhodecode_db_repo)}
     </div>
 
     <div id="pjax-container" class="summary">
         <div id="files_data">
             <%include file='files_pjax.html'/>
         </div>
     </div>
     <script>
         var curState = {
             commit_id: "${c.commit.raw_id}"
         };
 
         var getState = function(context) {
             var url = $(location).attr('href');
             var _base_url = '${h.url("files_home",repo_name=c.repo_name,revision='',f_path='')}';
             var _annotate_url = '${h.url("files_annotate_home",repo_name=c.repo_name,revision='',f_path='')}';
             _base_url = _base_url.replace('//', '/');
             _annotate_url = _annotate_url.replace('//', '/');
 
             //extract f_path from url.
             var parts = url.split(_base_url);
             if (parts.length != 2) {
                 parts = url.split(_annotate_url);
                 if (parts.length != 2) {
                     var rev = "tip";
                     var f_path = "";
                 } else {
                     var parts2 = parts[1].split('/');
                     var rev = parts2.shift(); // pop the first element which is the revision
                     var f_path = parts2.join('/');
                 }
 
             } else {
                 var parts2 = parts[1].split('/');
                 var rev = parts2.shift(); // pop the first element which is the revision
                 var f_path = parts2.join('/');
             }
 
             var _node_list_url = pyroutes.url('files_nodelist_home',
                     {repo_name: templateContext.repo_name,
                      revision: rev, f_path: f_path});
             var _url_base = pyroutes.url('files_home',
                     {repo_name: templateContext.repo_name,
                      revision: rev, f_path:'__FPATH__'});
             return {
                 url: url,
                 f_path: f_path,
                 rev: rev,
                 commit_id: curState.commit_id,
                 node_list_url: _node_list_url,
                 url_base: _url_base
             };
         };
 
         var metadataRequest = null;
         var getFilesMetadata = function() {
             if (metadataRequest && metadataRequest.readyState != 4) {
                 metadataRequest.abort();
             }
             if (source_page) {
                 return false;
             }
             var state = getState('metadata');
             var url_data = {
                 'repo_name': templateContext.repo_name,
                 'revision': state.commit_id,
                 'f_path': state.f_path
             };
 
             var url = pyroutes.url('files_metadata_list_home', url_data);
 
             metadataRequest = $.ajax({url: url});
 
             metadataRequest.done(function(data) {
                 var data = data.metadata;
                 var dataLength = data.length;
                 for (var i = 0; i < dataLength; i++) {
                     var rowData = data[i];
                     var name = rowData.name.replace('\\', '\\\\');
 
                     $('td[title="size-' + name + '"]').html(rowData.size);
                     var timeComponent = AgeModule.createTimeComponent(
                             rowData.modified_ts, rowData.modified_at);
                     $('td[title="modified_at-' + name + '"]').html(timeComponent);
 
                     $('td[title="revision-' + name + '"]').html(
                             '<div class="tooltip" title="{0}"><pre>r{1}:{2}</pre></div>'.format(
                                     data[i].message, data[i].revision, data[i].short_id));
                     $('td[title="author-' + name + '"]').html(
                             '<span title="{0}">{1}</span>'.format(
                                     data[i].author, data[i].user_profile));
                 }
                 tooltip_activate();
                 timeagoActivate();
             });
             metadataRequest.fail(function (data, textStatus, errorThrown) {
                 console.log(data);
                 if (data.status != 0) {
                     alert("Error while fetching metadata.\nError code {0} ({1}).Please consider reloading the page".format(data.status,data.statusText));
                 }
             });
         };
 
         var callbacks = function() {
             var state = getState('callbacks');
             tooltip_activate();
             timeagoActivate();
 
             // used for history, and switch to
             var initialCommitData = {
                 id: null,
                 text: "${_("Switch To Commit")}",
                 type: 'sha',
                 raw_id: null,
                 files_url: null
             };
 
             if ($('#trimmed_message_box').height() < 50) {
                 $('#message_expand').hide();
             }
 
             $('#message_expand').on('click', function(e) {
                 $('#trimmed_message_box').css('max-height', 'none');
                 $(this).hide();
             });
 
 
             if (source_page) {
                 // variants for with source code, not tree view
 
                 if (location.href.indexOf('#') != -1) {
                     page_highlights = location.href.substring(location.href.indexOf('#') + 1).split('L');
                     if (page_highlights.length == 2) {
                         highlight_ranges = page_highlights[1].split(",");
 
                         var h_lines = [];
                         for (pos in highlight_ranges) {
                             var _range = highlight_ranges[pos].split('-');
                             if (_range.length == 2) {
                                 var start = parseInt(_range[0]);
                                 var end = parseInt(_range[1]);
                                 if (start < end) {
                                     for (var i = start; i <= end; i++) {
                                         h_lines.push(i);
                                     }
                                 }
                             }
                             else {
                                 h_lines.push(parseInt(highlight_ranges[pos]));
                             }
                         }
 
                         for (pos in h_lines) {
                             // @comment-highlight-color
                             $('#L' + h_lines[pos]).css('background-color', '#ffd887');
                         }
 
                         var _first_line = $('#L' + h_lines[0]).get(0);
                         if (_first_line) {
                             var line = $('#L' + h_lines[0]);
                             offsetScroll(line, 70);
                         }
                     }
                 }
 
                 // select code link event
                 $("#hlcode").mouseup(getSelectionLink);
 
                 // file history select2
                 select2FileHistorySwitcher('#diff1', initialCommitData, state);
                 $('#diff1').on('change', function(e) {
                     $('#diff').removeClass('disabled').removeAttr("disabled");
                     $('#show_rev').removeClass('disabled').removeAttr("disabled");
                 });
 
                 // show more authors
                 $('#show_authors').on('click', function(e) {
                     e.preventDefault();
                     var url = pyroutes.url('files_authors_home',
                                 {'repo_name': templateContext.repo_name,
                                  'revision': state.rev, 'f_path': state.f_path});
 
                     $.pjax({
                         url: url,
                         data: 'annotate=${"1" if c.annotate else "0"}',
                         container: '#file_authors',
                         push: false,
                         timeout: pjaxTimeout
                     }).complete(function(){
                         $('#show_authors').hide();
                     })
                 });
 
                 // load file short history
                 $('#file_history_overview').on('click', function(e) {
                     e.preventDefault();
                     path = state.f_path;
                     if (path.indexOf("#") >= 0) {
                         path = path.slice(0, path.indexOf("#"));
                     }
                     var url = pyroutes.url('changelog_file_home',
                             {'repo_name': templateContext.repo_name,
                              'revision': state.rev, 'f_path': path, 'limit': 6});
                     $('#file_history_container').show();
-                    $('#file_history_container').html('<div class="file-history-inner">{0}</div>'.format(_TM['Loading ...']));
+                    $('#file_history_container').html('<div class="file-history-inner">{0}</div>'.format(_gettext('Loading ...')));
 
                     $.pjax({
                         url: url,
                         container: '#file_history_container',
                         push: false,
                         timeout: pjaxTimeout
                     })
                 });
 
             }
             else {
                 getFilesMetadata();
 
                 // fuzzy file filter
                 fileBrowserListeners(state.node_list_url, state.url_base);
 
                 // switch to widget
                 select2RefSwitcher('#refs_filter', initialCommitData);
                 $('#refs_filter').on('change', function(e) {
                     var data = $('#refs_filter').select2('data');
                     curState.commit_id = data.raw_id;
                     $.pjax({url: data.files_url, container: '#pjax-container', timeout: pjaxTimeout});
                 });
 
                 $("#prev_commit_link").on('click', function(e) {
                     var data = $(this).data();
                     curState.commit_id = data.commitId;
                 });
 
                 $("#next_commit_link").on('click', function(e) {
                     var data = $(this).data();
                     curState.commit_id = data.commitId;
                 });
 
                 $('#at_rev').on("keypress", function(e) {
                     /* ENTER PRESSED */
                     if (e.keyCode === 13) {
                         var rev = $('#at_rev').val();
                         // explicit reload page here. with pjax entering bad input
                         // produces not so nice results
                         window.location = pyroutes.url('files_home',
                                 {'repo_name': templateContext.repo_name,
                                  'revision': rev, 'f_path': state.f_path});
                     }
                 });
             }
         };
 
         var pjaxTimeout = 5000;
 
         $(document).pjax(".pjax-link", "#pjax-container", {
             "fragment": "#pjax-content",
             "maxCacheLength": 1000,
             "timeout": pjaxTimeout
         });
 
         // define global back/forward states
         var isPjaxPopState = false;
         $(document).on('pjax:popstate', function() {
             isPjaxPopState = true;
         });
 
         $(document).on('pjax:end', function(xhr, options) {
             if (isPjaxPopState) {
                 isPjaxPopState = false;
                 callbacks();
                 _NODEFILTER.resetFilter();
             }
 
             // run callback for tracking if defined for google analytics etc.
             // this is used to trigger tracking on pjax
             if (typeof window.rhodecode_statechange_callback !== 'undefined') {
                 var state = getState('statechange');
                 rhodecode_statechange_callback(state.url, null)
             }
         });
 
         $(document).on('pjax:success', function(event, xhr, options) {
             if (event.target.id == "file_history_container") {
                 $('#file_history_overview').hide();
                 $('#file_history_overview_full').show();
                 timeagoActivate();
                 tooltip_activate();
             } else {
                 callbacks();
             }
         });
 
         $(document).ready(function() {
             callbacks();
             var search_GET = "${request.GET.get('search','')}";
             if (search_GET == "1") {
                 _NODEFILTER.initFilter();
             }
         });
 
     </script>
 
 
 </%def>

rhodecode/templates/files/files_add.html

@@ -1,232 +1,232 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('%s Files Add') % c.repo_name}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Add new file')} @ ${h.show_id(c.commit)}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 <div class="box">
     <div class="title">
         ${self.repo_page_title(c.rhodecode_db_repo)}
     </div>
     <div class="edit-file-title">
         ${self.breadcrumbs()}
     </div>
     ${h.secure_form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal")}
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div id="destination-label" class="left-label">
                 ${_('Path')}:
             </div>
             <div class="right-content">
                 <div id="specify-custom-path-container">
                     <span id="path-breadcrumbs">${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.f_path)}</span>
                     <a class="custom-path-link" id="specify-custom-path" href="#">${_('Specify Custom Path')}</a>
                 </div>
                 <div id="remove-custom-path-container" style="display: none;">
                     ${c.repo_name}/
                     <input type="input-small" value="${c.f_path}" size="46" name="location" id="location">
                     <a class="custom-path-link" id="remove-custom-path" href="#">${_('Remove Custom Path')}</a>
                 </div>
             </div>
         </div>
         <div id="filename_container" class="fieldset">
             <div class="filename-label left-label">
                 ${_('Filename')}:
             </div>
             <div class="right-content">
                 <input class="input-small" type="text" value="" size="46" name="filename" id="filename">
                 <p>${_('or')} <a id="upload_file_enable" href="#">${_('Upload File')}</a></p>
             </div>
         </div>
         <div id="upload_file_container" class="fieldset" style="display: none;">
             <div class="filename-label left-label">
                 ${_('Upload file')}:
             </div>
             <div class="right-content file-upload-input">
                 <label for="upload_file" class="btn btn-default">Browse</label>
                 <span id="selected-file">${_('No file selected')}</span>
                 <input type="file" name="upload_file" id="upload_file">
                 <p>${_('or')} <a id="file_enable" href="#">${_('Create New File')}</a></p>
             </div>
         </div>
     </div>
     <div class="table">
         <div id="files_data">
             <div id="codeblock" class="codeblock">
             <div class="code-header form" id="set_mode_header">
                 <div class="fields">
                     ${h.dropdownmenu('set_mode','plain',[('plain',_('plain'))],enable_filter=True)}
                     <label for="line_wrap">${_('line wraps')}</label>
                     ${h.dropdownmenu('line_wrap', 'off', [('on', _('on')), ('off', _('off')),])}
 
                     <div id="render_preview" class="btn btn-small preview hidden" >${_('Preview')}</div>
                 </div>
             </div>
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" ></textarea>
                     <div id="editor_preview"></div>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div id="commit-message-label" class="commit-message-label left-label">
                 ${_('Commit Message')}:
             </div>
             <div class="right-content">
                 <div class="message">
                     <textarea id="commit" name="message"  placeholder="${c.default_message}"></textarea>
                 </div>
             </div>
         </div>
         <div class="pull-right">
             ${h.reset('reset',_('Cancel'),class_="btn btn-small")}
             ${h.submit('commit_btn',_('Commit changes'),class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script type="text/javascript">
 
     $('#commit_btn').on('click', function() {
         var button = $(this);
         if (button.hasClass('clicked')) {
             button.attr('disabled', true);
         } else {
             button.addClass('clicked');
         }
     });
     
     $('#specify-custom-path').on('click', function(e){
         e.preventDefault();
         $('#specify-custom-path-container').hide();
         $('#remove-custom-path-container').show();
         $('#destination-label').css('margin-top', '13px');
     });
 
     $('#remove-custom-path').on('click', function(e){
         e.preventDefault();
         $('#specify-custom-path-container').show();
         $('#remove-custom-path-container').hide();
         $('#location').val('${c.f_path}');
         $('#destination-label').css('margin-top', '0');
     });
 
     var hide_upload = function(){
         $('#files_data').show();
         $('#upload_file_container').hide();
         $('#filename_container').show();
     };
 
     $('#file_enable').on('click', function(e){
         e.preventDefault();
         hide_upload();
     });
 
     $('#upload_file_enable').on('click', function(e){
         e.preventDefault();
         $('#files_data').hide();
         $('#upload_file_container').show();
         $('#filename_container').hide();
         if (detectIE() && detectIE() <= 9) {
             $('#upload_file_container .file-upload-input label').hide();
             $('#upload_file_container .file-upload-input span').hide();
             $('#upload_file_container .file-upload-input input').show();
         }
     });
 
     $('#upload_file').on('change', function() {
         if (detectIE() && detectIE() <= 9) {
             if (this.files && this.files[0]) {
                 $('#selected-file').html(this.files[0].name);
             }
         }
     });
 
     hide_upload();
 
     var renderer = "";
     var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.f_path)}";
     var myCodeMirror = initCodeMirror('editor', reset_url, false);
 
     var modes_select = $('#set_mode');
     fillCodeMirrorOptions(modes_select);
 
     var filename_selector = '#filename';
     var callback = function(filename, mimetype, mode){
         CodeMirrorPreviewEnable(mode);
     };
     // on change of select field set mode
     setCodeMirrorModeFromSelect(
             modes_select, filename_selector, myCodeMirror, callback);
 
     // on entering the new filename set mode, from given extension
     setCodeMirrorModeFromInput(
         modes_select, filename_selector, myCodeMirror, callback);
 
     // if the file is renderable set line wraps automatically
     if (renderer !== ""){
         var line_wrap = 'on';
         $($('#line_wrap option[value="'+line_wrap+'"]')[0]).attr("selected", "selected");
         setCodeMirrorLineWrap(myCodeMirror, true);
     }
 
     // on select line wraps change the editor
     $('#line_wrap').on('change', function(e){
         var selected = e.currentTarget;
         var line_wraps = {'on': true, 'off': false}[selected.value];
         setCodeMirrorLineWrap(myCodeMirror, line_wraps)
     });
 
     // render preview/edit button
     $('#render_preview').on('click', function(e){
         if($(this).hasClass('preview')){
             $(this).removeClass('preview');
             $(this).html("${_('Edit')}");
             $('#editor_preview').show();
             $(myCodeMirror.getWrapperElement()).hide();
 
             var possible_renderer = {
                 'rst':'rst',
                 'markdown':'markdown',
                 'gfm': 'markdown'}[myCodeMirror.getMode().name];
             var _text = myCodeMirror.getValue();
             var _renderer = possible_renderer || DEFAULT_RENDERER;
             var post_data = {'text': _text, 'renderer': _renderer, 'csrf_token': CSRF_TOKEN};
-            $('#editor_preview').html(_TM['Loading ...']);
+            $('#editor_preview').html(_gettext('Loading ...'));
             var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});
 
             ajaxPOST(url, post_data, function(o){
                 $('#editor_preview').html(o);
             })
         }
         else{
             $(this).addClass('preview');
             $(this).html("${_('Preview')}");
             $('#editor_preview').hide();
             $(myCodeMirror.getWrapperElement()).show();
         }
     });
     $('#filename').focus();
 
 </script>
 </%def>

rhodecode/templates/files/files_edit.html

@@ -1,193 +1,193 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('%s File Edit') % c.repo_name}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Edit file')} @ ${h.show_id(c.commit)}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
 <% renderer = h.renderer_from_filename(c.f_path)%>
 <div class="box">
     <div class="title">
         ${self.repo_page_title(c.rhodecode_db_repo)}
     </div>
     <div class="edit-file-title">
         ${self.breadcrumbs()}
     </div>
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div id="destination-label" class="left-label">
                 ${_('Path')}:
             </div>
             <div class="right-content">
                 <div id="specify-custom-path-container">
                     <span id="path-breadcrumbs">${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.f_path)}</span>
                 </div>
             </div>
         </div>
     </div>
 
     <div class="table">
         ${h.secure_form(h.url.current(),method='post',id='eform')}
         <div id="codeblock" class="codeblock" >
         <div class="code-header">
             <div class="stats">
                 <i class="icon-file"></i>
                 <span class="item">${h.link_to("r%s:%s" % (c.file.commit.idx,h.short_id(c.file.commit.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.commit.raw_id))}</span>
                 <span class="item">${h.format_byte_size_binary(c.file.size)}</span>
                 <span class="item last">${c.file.mimetype}</span>
                 <div class="buttons">
                   <a class="btn btn-mini" href="${h.url('changelog_file_home',repo_name=c.repo_name, revision=c.commit.raw_id, f_path=c.f_path)}">
                       <i class="icon-time"></i> ${_('history')}
                   </a>
 
                   % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                    % if not c.file.is_binary:
                       %if True:
                         ${h.link_to(_('source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.f_path),class_="btn btn-mini")}
                       %else:
                         ${h.link_to(_('annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.f_path),class_="btn btn-mini")}
                       %endif
                       ${h.link_to(_('raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.f_path),class_="btn btn-mini")}
                       <a class="btn btn-mini" href="${h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.f_path)}">
                           <i class="icon-archive"></i> ${_('download')}
                       </a>
                    % endif
                   % endif
                 </div>
             </div>
             <div class="form">
                 <label for="set_mode">${_('Editing file')}:</label>
                 ${'%s /' % c.file.dir_path if c.file.dir_path else c.file.dir_path}
                 <input id="filename" type="text" name="filename" value="${c.file.name}">
 
                 ${h.dropdownmenu('set_mode','plain',[('plain',_('plain'))],enable_filter=True)}
                 <label for="line_wrap">${_('line wraps')}</label>
                 ${h.dropdownmenu('line_wrap', 'off', [('on', _('on')), ('off', _('off')),])}
 
                 <div id="render_preview" class="btn btn-small preview hidden">${_('Preview')}</div>
             </div>
         </div>
             <div id="editor_container">
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" >${h.escape(c.file.content)|n}</textarea>
                 <div id="editor_preview" ></div>
             </div>
         </div>
     </div>
 
     <div class="edit-file-fieldset">
         <div class="fieldset">
             <div id="commit-message-label" class="commit-message-label left-label">
                 ${_('Commit Message')}:
             </div>
             <div class="right-content">
                 <div class="message">
                     <textarea id="commit" name="message" placeholder="${c.default_message}"></textarea>
                 </div>
             </div>
         </div>
         <div class="pull-right">
             ${h.reset('reset',_('Cancel'),class_="btn btn-small")}
             ${h.submit('commit',_('Commit changes'),class_="btn btn-small btn-success")}
         </div>
     </div>
     ${h.end_form()}
 </div>
 
 <script type="text/javascript">
 $(document).ready(function(){
     var renderer = "${renderer}";
     var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.file.path)}";
     var myCodeMirror = initCodeMirror('editor', reset_url);
 
     var modes_select = $('#set_mode');
     fillCodeMirrorOptions(modes_select);
 
     // try to detect the mode based on the file we edit
     var mimetype = "${c.file.mimetype}";
     var detected_mode = detectCodeMirrorMode(
             "${c.file.name}", mimetype);
 
     if(detected_mode){
         setCodeMirrorMode(myCodeMirror, detected_mode);
         $(modes_select).select2("val", mimetype);
         $(modes_select).change();
         setCodeMirrorMode(myCodeMirror, detected_mode);
     }
 
     var filename_selector = '#filename';
     var callback = function(filename, mimetype, mode){
         CodeMirrorPreviewEnable(mode);
     };
     // on change of select field set mode
     setCodeMirrorModeFromSelect(
             modes_select, filename_selector, myCodeMirror, callback);
 
     // on entering the new filename set mode, from given extension
     setCodeMirrorModeFromInput(
         modes_select, filename_selector, myCodeMirror, callback);
 
     // if the file is renderable set line wraps automatically
     if (renderer !== ""){
         var line_wrap = 'on';
         $($('#line_wrap option[value="'+line_wrap+'"]')[0]).attr("selected", "selected");
         setCodeMirrorLineWrap(myCodeMirror, true);
     }
     // on select line wraps change the editor
     $('#line_wrap').on('change', function(e){
         var selected = e.currentTarget;
         var line_wraps = {'on': true, 'off': false}[selected.value];
         setCodeMirrorLineWrap(myCodeMirror, line_wraps)
     });
 
     // render preview/edit button
     if (mimetype === 'text/x-rst' || mimetype === 'text/plain') {
         $('#render_preview').removeClass('hidden');
     }
     $('#render_preview').on('click', function(e){
         if($(this).hasClass('preview')){
             $(this).removeClass('preview');
             $(this).html("${_('Edit')}");
             $('#editor_preview').show();
             $(myCodeMirror.getWrapperElement()).hide();
 
             var possible_renderer = {
                 'rst':'rst',
                 'markdown':'markdown',
                 'gfm': 'markdown'}[myCodeMirror.getMode().name];
             var _text = myCodeMirror.getValue();
             var _renderer = possible_renderer || DEFAULT_RENDERER;
             var post_data = {'text': _text, 'renderer': _renderer, 'csrf_token': CSRF_TOKEN};
-            $('#editor_preview').html(_TM['Loading ...']);
+            $('#editor_preview').html(_gettext('Loading ...'));
             var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});
 
             ajaxPOST(url, post_data, function(o){
                 $('#editor_preview').html(o);
             })
         }
         else{
             $(this).addClass('preview');
             $(this).html("${_('Preview')}");
             $('#editor_preview').hide();
             $(myCodeMirror.getWrapperElement()).show();
         }
     });
 
 })
 </script>
 </%def>

rhodecode/templates/pullrequests/pullrequest_show.html

@@ -1,568 +1,568 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     <span id="pr-title">
     ${c.pull_request.title}
     %if c.pull_request.is_closed():
         (${_('Closed')})
     %endif
     </span>
     <div id="pr-title-edit" class="input" style="display: none;">
         ${h.text('pullrequest_title', id_="pr-title-input", class_="large", value=c.pull_request.title)}
     </div>
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='showpullrequest')}
 </%def>
 
 <%def name="main()">
 <script type="text/javascript">
     // TODO: marcink switch this to pyroutes
     AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
     templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
 </script>
 <div class="box">
   <div class="title">
     ${self.repo_page_title(c.rhodecode_db_repo)}
   </div>
 
   ${self.breadcrumbs()}
 
 
   <div class="box pr-summary">
       <div class="summary-details block-left">
         <%summary = lambda n:{False:'summary-short'}.get(n)%>
         <div class="pr-details-title">
             ${_('Pull request #%s') % c.pull_request.pull_request_id} ${_('From')} ${h.format_date(c.pull_request.created_on)}
             %if c.allowed_to_update:
               <span id="open_edit_pullrequest" class="block-right action_button">${_('Edit')}</span>
               <span id="close_edit_pullrequest" class="block-right action_button" style="display: none;">${_('Close')}</span>
             %endif
         </div>
 
         <div id="summary" class="fields pr-details-content">
            <div class="field">
             <div class="label-summary">
                 <label>${_('Origin')}:</label>
             </div>
             <div class="input">
                 <div class="pr-origininfo">
                     ## branch link is only valid if it is a branch
                     <span class="tag">
                       %if c.pull_request.source_ref_parts.type == 'branch':
                         <a href="${h.url('changelog_home', repo_name=c.pull_request.source_repo.repo_name, branch=c.pull_request.source_ref_parts.name)}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
                       %else:
                         ${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}
                       %endif
                     </span>
                     <span class="clone-url">
                         <a href="${h.url('summary_home', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
                     </span>
                 </div>
                 <div class="pr-pullinfo">
                      %if h.is_hg(c.pull_request.source_repo):
                         <input type="text"  value="hg pull -r ${h.short_id(c.source_ref)} ${c.pull_request.source_repo.clone_url()}" readonly="readonly">
                      %elif h.is_git(c.pull_request.source_repo):
                         <input type="text"  value="git pull ${c.pull_request.source_repo.clone_url()} ${c.pull_request.source_ref_parts.name}" readonly="readonly">
                      %endif
                 </div>
             </div>
            </div>
            <div class="field">
             <div class="label-summary">
                 <label>${_('Target')}:</label>
             </div>
             <div class="input">
                 <div class="pr-targetinfo">
                     ## branch link is only valid if it is a branch
                     <span class="tag">
                       %if c.pull_request.target_ref_parts.type == 'branch':
                         <a href="${h.url('changelog_home', repo_name=c.pull_request.target_repo.repo_name, branch=c.pull_request.target_ref_parts.name)}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
                       %else:
                         ${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}
                       %endif
                     </span>
                     <span class="clone-url">
                         <a href="${h.url('summary_home', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
                     </span>
                 </div>
             </div>
            </div>
            <div class="field">
             <div class="label-summary">
                 <label>${_('Review')}:</label>
             </div>
             <div class="input">
               %if c.pull_request_review_status:
                 <div class="${'flag_status %s' % c.pull_request_review_status} tooltip pull-left"></div>
                 <span class="changeset-status-lbl tooltip">
                   %if c.pull_request.is_closed():
                       ${_('Closed')},
                   %endif
                   ${h.commit_status_lbl(c.pull_request_review_status)}
                 </span>
                 - ${ungettext('calculated based on %s reviewer vote', 'calculated based on %s reviewers votes', len(c.pull_request_reviewers)) % len(c.pull_request_reviewers)}
               %endif
             </div>
            </div>
            <div class="field">
             <div class="pr-description-label label-summary">
                 <label>${_('Description')}:</label>
             </div>
             <div id="pr-desc" class="input">
                 <div class="pr-description">${h.urlify_commit_message(c.pull_request.description, c.repo_name)}</div>
             </div>
             <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
                 <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
             </div>
            </div>
            <div class="field">
             <div class="label-summary">
                 <label>${_('Comments')}:</label>
             </div>
             <div class="input">
                 <div>
                     <div class="comments-number">
                         %if c.comments:
                             <a href="#comments">${ungettext("%d Pull request comment", "%d Pull request comments", len(c.comments)) % len(c.comments)}</a>,
                         %else:
                             ${ungettext("%d Pull request comment", "%d Pull request comments", len(c.comments)) % len(c.comments)}
                         %endif
                         %if c.inline_cnt:
                             ## this is replaced with a proper link to first comment via JS linkifyComments() func
                             <a href="#inline-comments" id="inline-comments-counter">${ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}</a>
                         %else:
                             ${ungettext("%d Inline Comment", "%d Inline Comments", c.inline_cnt) % c.inline_cnt}
                         %endif
 
                         % if c.outdated_cnt:
                           ,${ungettext("%d Outdated Comment", "%d Outdated Comments", c.outdated_cnt) % c.outdated_cnt} <span id="show-outdated-comments" class="btn btn-link">${_('(Show)')}</span>
                         % endif
                    </div>
                 </div>
             </div>
            </div>
            <div id="pr-save" class="field" style="display: none;">
             <div class="label-summary"></div>
             <div class="input">
               <span id="edit_pull_request" class="btn btn-small">${_('Save Changes')}</span>
             </div>
            </div>
         </div>
       </div>
       <div>
         ## AUTHOR
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
               ${_('Author')}
           </div>
         </div>
         <div class="block-right pr-details-content reviewers">
             <ul class="group_members">
               <li>
                 ${self.gravatar_with_user(c.pull_request.author.email, 16)}
               </li>
             </ul>
         </div>
         ## REVIEWERS
         <div class="reviewers-title block-right">
           <div class="pr-details-title">
               ${_('Pull request reviewers')}
               %if c.allowed_to_update:
                 <span id="open_edit_reviewers" class="block-right action_button">${_('Edit')}</span>
                 <span id="close_edit_reviewers" class="block-right action_button" style="display: none;">${_('Close')}</span>
               %endif
           </div>
         </div>
         <div id="reviewers" class="block-right pr-details-content reviewers">
           ## members goes here !
             <ul id="review_members" class="group_members">
             %for member,status in c.pull_request_reviewers:
               <li id="reviewer_${member.user_id}">
                 <div class="reviewers_member">
                     <div class="reviewer_status tooltip" title="${h.tooltip(h.commit_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
                       <div class="${'flag_status %s' % (status[0][1].status if status else 'not_reviewed')} pull-left reviewer_member_status"></div>
                     </div>
                   <div id="reviewer_${member.user_id}_name" class="reviewer_name">
                     ${self.gravatar_with_user(member.email, 16)} <div class="reviewer">(${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>
                   </div>
                   <input id="reviewer_${member.user_id}_input" type="hidden" value="${member.user_id}" name="review_members" />
                   %if c.allowed_to_update:
                   <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
                       <i class="icon-remove-sign" ></i>
                   </div>
                   %endif
                 </div>
               </li>
             %endfor
             </ul>
           %if not c.pull_request.is_closed():
           <div id="add_reviewer_input" class='ac' style="display: none;">
             %if c.allowed_to_update:
             <div class="reviewer_ac">
                ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
                <div id="reviewers_container"></div>
             </div>
             <div>
              <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>
             </div>
             %endif
           </div>
           %endif
         </div>
       </div>
   </div>
   <div class="box">
       ##DIFF
       <div class="table" >
           <div id="changeset_compare_view_content">
               ##CS
               % if c.missing_requirements:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing requirements:')}</strong>
                       ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
                     </div>
                   </div>
                 </div>
               % elif c.missing_commits:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing commits')}:</strong>
                         ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
                         ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
                     </div>
                   </div>
                 </div>
               % endif
                 <div class="compare_view_commits_title">
                     % if c.allowed_to_update and not c.pull_request.is_closed():
                       <button id="update_commits" class="btn btn-small">${_('Update commits')}</button>
                     % endif
                     % if len(c.commit_ranges):
                       <h2>${ungettext('Compare View: %s commit','Compare View: %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}</h2>
                     % endif
                 </div>
               % if not c.missing_commits:
                 <%include file="/compare/compare_commits.html" />
                 ## FILES
                 <div class="cs_files_title">
                     <span class="cs_files_expand">
                         <span id="expand_all_files">${_('Expand All')}</span> | <span id="collapse_all_files">${_('Collapse All')}</span>
                     </span>
                     <h2>
                         ${diff_block.diff_summary_text(len(c.files), c.lines_added, c.lines_deleted, c.limited_diff)}
                     </h2>
                 </div>
               % endif
               <div class="cs_files">
               %if not c.files and not c.missing_commits:
                   <span class="empty_data">${_('No files')}</span>
               %endif
               <table class="compare_view_files">
               <%namespace name="diff_block" file="/changeset/diff_block.html"/>
               %for FID, change, path, stats in c.files:
                   <tr class="cs_${change} collapse_file" fid="${FID}">
                       <td class="cs_icon_td">
                           <span class="collapse_file_icon" fid="${FID}"></span>
                       </td>
                       <td class="cs_icon_td">
                           <div class="flag_status not_reviewed hidden"></div>
                       </td>
                       <td class="cs_${change}" id="a_${FID}">
                           <div class="node">
                               <a href="#a_${FID}">
                                   <i class="icon-file-${change.lower()}"></i>
                                   ${h.safe_unicode(path)}
                               </a>
                           </div>
                       </td>
                       <td>
                           <div class="changes pull-right">${h.fancy_file_stats(stats)}</div>
                           <div class="comment-bubble pull-right" data-path="${path}">
                             <i class="icon-comment"></i>
                           </div>
                       </td>
                   </tr>
                   <tr fid="${FID}" id="diff_${FID}" class="diff_links">
                       <td></td>
                       <td></td>
                       <td class="cs_${change}">
                           %if c.target_repo.repo_name == c.repo_name:
                               ${diff_block.diff_menu(c.repo_name, h.safe_unicode(path), c.target_ref, c.source_ref, change)}
                           %else:
                               ## this is slightly different case later, since the other repo can have this
                               ## file in other state than the origin repo
                               ${diff_block.diff_menu(c.target_repo.repo_name, h.safe_unicode(path), c.target_ref, c.source_ref, change)}
                           %endif
                       </td>
                       <td class="td-actions rc-form">
                       </td>
                   </tr>
                   <tr id="tr_${FID}">
                     <td></td>
                     <td></td>
                     <td class="injected_diff" colspan="2">
                         ${diff_block.diff_block_simple([c.changes[FID]])}
                     </td>
                   </tr>
 
                 ## Loop through inline comments
                   % if c.outdated_comments.get(path,False):
                     <tr class="outdated">
                       <td></td>
                       <td></td>
                       <td colspan="2">
                         <p>${_('Outdated Inline Comments')}:</p>
                       </td>
                     </tr>
                     <tr class="outdated">
                       <td></td>
                       <td></td>
                       <td colspan="2" class="outdated_comment_block">
                       % for line, comments in c.outdated_comments[path].iteritems():
                           <div class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
                             % for co in comments:
                               ${comment.comment_block_outdated(co)}
                             % endfor
                           </div>
                       % endfor
                       </td>
                     </tr>
                   % endif
               %endfor
               ## Loop through inline comments for deleted files
               %for path in c.deleted_files:
                 <tr class="outdated deleted">
                   <td></td>
                   <td></td>
                   <td>${path}</td>
                 </tr>
                 <tr class="outdated deleted">
                   <td></td>
                   <td></td>
                   <td>(${_('Removed')})</td>
                 </tr>
                 % if path in c.outdated_comments:
                   <tr class="outdated deleted">
                     <td></td>
                     <td></td>
                     <td colspan="2">
                       <p>${_('Outdated Inline Comments')}:</p>
                     </td>
                   </tr>
                   <tr class="outdated">
                     <td></td>
                     <td></td>
                     <td colspan="2" class="outdated_comment_block">
                     % for line, comments in c.outdated_comments[path].iteritems():
                         <div class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
                           % for co in comments:
                             ${comment.comment_block_outdated(co)}
                           % endfor
                         </div>
                     % endfor
                     </td>
                   </tr>
                 % endif
               %endfor
               </table>
               </div>
               % if c.limited_diff:
               <h5>${_('Commit was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>
               % endif
           </div>
       </div>
 
       % if c.limited_diff:
         <p>${_('Commit was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></p>
       % endif
 
       ## template for inline comment form
       <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
       ${comment.comment_inline_form()}
 
       ## render comments and inlines
       ${comment.generate_comments(include_pull_request=True, is_pull_request=True)}
 
       % if not c.pull_request.is_closed():
         ## main comment form and it status
         ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
                                   pull_request_id=c.pull_request.pull_request_id),
                            c.pull_request_review_status,
                            is_pull_request=True, change_status=c.allowed_to_change_status)}
       %endif
 
       <script type="text/javascript">
         if (location.href.indexOf('#') != -1) {
           var id = '#'+location.href.substring(location.href.indexOf('#') + 1).split('#');
           var line = $('html').find(id);
           offsetScroll(line, 70);
         }
         $(function(){
             ReviewerAutoComplete('user');
             // custom code mirror
             var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
 
             var PRDetails = {
               editButton: $('#open_edit_pullrequest'),
               closeButton: $('#close_edit_pullrequest'),
               viewFields: $('#pr-desc, #pr-title'),
               editFields: $('#pr-desc-edit, #pr-title-edit, #pr-save'),
 
               init: function() {
                 var that = this;
                 this.editButton.on('click', function(e) { that.edit(); });
                 this.closeButton.on('click', function(e) { that.view(); });
               },
 
               edit: function(event) {
                 this.viewFields.hide();
                 this.editButton.hide();
                 this.editFields.show();
                 codeMirrorInstance.refresh();
               },
 
               view: function(event) {
                 this.editFields.hide();
                 this.closeButton.hide();
                 this.viewFields.show();
               }
             };
 
             var ReviewersPanel = {
               editButton: $('#open_edit_reviewers'),
               closeButton: $('#close_edit_reviewers'),
               addButton: $('#add_reviewer_input'),
               removeButtons: $('.reviewer_member_remove'),
 
               init: function() {
                 var that = this;
                 this.editButton.on('click', function(e) { that.edit(); });
                 this.closeButton.on('click', function(e) { that.close(); });
               },
 
               edit: function(event) {
                 this.editButton.hide();
                 this.closeButton.show();
                 this.addButton.show();
                 this.removeButtons.css('visibility', 'visible');
               },
 
               close: function(event) {
                 this.editButton.show();
                 this.closeButton.hide();
                 this.addButton.hide();
                 this.removeButtons.css('visibility', 'hidden');
               }
             };
 
             PRDetails.init();
             ReviewersPanel.init();
 
             $('#show-outdated-comments').on('click', function(e){
                 var button = $(this);
                 var outdated = $('.outdated');
                 if (button.html() === "(Show)") {
                   button.html("(Hide)");
                   outdated.show();
                 } else {
                   button.html("(Show)");
                   outdated.hide();
                 }
             });
 
             $('.show-inline-comments').on('change', function(e){
                 var show = 'none';
                 var target = e.currentTarget;
                 if(target.checked){
                     show = ''
                 }
                 var boxid = $(target).attr('id_for');
                 var comments = $('#{0} .inline-comments'.format(boxid));
                 var fn_display = function(idx){
                    $(this).css('display', show);
                 };
                 $(comments).each(fn_display);
                 var btns = $('#{0} .inline-comments-button'.format(boxid));
                 $(btns).each(fn_display);
             });
 
             // inject comments into their proper positions
             var file_comments = $('.inline-comment-placeholder');
             %if c.pull_request.is_closed():
                 renderInlineComments(file_comments, false);
             %else:
                 renderInlineComments(file_comments, true);
             %endif
             var commentTotals = {};
             $.each(file_comments, function(i, comment) {
                 var path = $(comment).attr('path');
                 var comms = $(comment).children().length;
                 if (path in commentTotals) {
                     commentTotals[path] += comms;
                 } else {
                     commentTotals[path] = comms;
                 }
             });
             $.each(commentTotals, function(path, total) {
                 var elem = $('.comment-bubble[data-path="'+ path +'"]');
                 elem.css('visibility', 'visible');
                 elem.html(elem.html() + ' ' + total );
             });
 
             $('#merge_pull_request_form').submit(function() {
                 if (!$('#merge_pull_request').attr('disabled')) {
                     $('#merge_pull_request').attr('disabled', 'disabled');
                 }
                 return true;
             });
 
             $('#edit_pull_request').on('click', function(e){
                 var title = $('#pr-title-input').val();
                 var description = codeMirrorInstance.getValue();
                 editPullRequest(
                     "${c.repo_name}", "${c.pull_request.pull_request_id}",
                     title, description);
             });
 
             $('#update_pull_request').on('click', function(e){
                 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
             });
 
             $('#update_commits').on('click', function(e){
                 var isDisabled = !$(e.currentTarget).attr('disabled');
-                $(e.currentTarget).text(_TM['Updating...']);
+                $(e.currentTarget).text(_gettext('Updating...'));
                 $(e.currentTarget).attr('disabled', 'disabled');
                 if(isDisabled){
                     updateCommits("${c.repo_name}", "${c.pull_request.pull_request_id}");
                 }
 
             });
             // fixing issue with caches on firefox
             $('#update_commits').removeAttr("disabled");
 
             $('#close_pull_request').on('click', function(e){
                 closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
             });
         })
       </script>
 
   </div>
 </div>
 
 </%def>

setup.cfg

@@ -1,39 +1,42 b''
 [aliases]
 test = pytest
 
 [egg_info]
 tag_build =
 tag_svn_revision = false
 
 # Babel configuration
 [compile_catalog]
 domain = rhodecode
 directory = rhodecode/i18n
 statistics = true
 
 [extract_messages]
 add_comments = TRANSLATORS:
 output_file = rhodecode/i18n/rhodecode.pot
 msgid-bugs-address = [e-mail]
 copyright-holder = RhodeCode GmbH
 no-wrap = true
-keywords = lazy_ugettext
+keywords =
+    lazy_ugettext
+    _ngettext
+    _gettext
 
 [init_catalog]
 domain = rhodecode
 input_file = rhodecode/i18n/rhodecode.pot
 output_dir = rhodecode/i18n
 
 [update_catalog]
 domain = rhodecode
 input_file = rhodecode/i18n/rhodecode.pot
 output_dir = rhodecode/i18n
 previous = true
 
 [build_sphinx]
 source-dir = docs/
 build-dir  = docs/_build
 all_files  = 1
 
 [upload_sphinx]
 upload-dir = docs/_build/html

setup.py

@@ -1,248 +1,249 b''
 # -*- coding: utf-8 -*-
 
 # Import early to make sure things are patched up properly
 from setuptools import setup, find_packages
 
 import os
 import sys
 import platform
 
 if sys.version_info < (2, 7):
     raise Exception('RhodeCode requires Python 2.7 or later')
 
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 
 def _get_meta_var(name, data, callback_handler=None):
     import re
     matches = re.compile(r'(?:%s)\s*=\s*(.*)' % name).search(data)
     if matches:
         if not callable(callback_handler):
             callback_handler = lambda v: v
 
         return callback_handler(eval(matches.groups()[0]))
 
 _meta = open(os.path.join(here, 'rhodecode', '__init__.py'), 'rb')
 _metadata = _meta.read()
 _meta.close()
 
 callback = lambda V: ('.'.join(map(str, V[:3])) + '.'.join(V[3:]))
 __version__ = open(os.path.join('rhodecode', 'VERSION')).read().strip()
 __license__ = _get_meta_var('__license__', _metadata)
 __author__ = _get_meta_var('__author__', _metadata)
 __url__ = _get_meta_var('__url__', _metadata)
 # defines current platform
 __platform__ = platform.system()
 
 # Cygwin has different platform identifiers, but they all contain the
 # term "CYGWIN"
 is_windows = __platform__ == 'Windows' or 'CYGWIN' in __platform__
 
 requirements = [
     'Babel',
     'Beaker',
     'FormEncode',
     'Mako',
     'Markdown',
     'MarkupSafe',
     'MySQL-python',
     'Paste',
     'PasteDeploy',
     'PasteScript',
     'Pygments',
     'Pylons',
     'Pyro4',
     'Routes',
     'SQLAlchemy',
     'Tempita',
     'URLObject',
     'WebError',
     'WebHelpers',
     'WebHelpers2',
     'WebOb',
     'WebTest',
     'Whoosh',
     'alembic',
     'amqplib',
     'anyjson',
     'appenlight-client',
     'authomatic',
     'backport_ipaddress',
     'celery',
     'colander',
     'decorator',
     'docutils',
     'gunicorn',
     'infrae.cache',
     'ipython',
     'iso8601',
     'kombu',
     'msgpack-python',
     'packaging',
     'psycopg2',
     'py-gfm',
     'pycrypto',
     'pycurl',
     'pyparsing',
     'pyramid',
     'pyramid-debugtoolbar',
     'pyramid-mako',
     'pyramid-beaker',
     'pysqlite',
     'python-dateutil',
     'python-ldap',
     'python-memcached',
     'python-pam',
     'recaptcha-client',
     'repoze.lru',
     'requests',
     'simplejson',
     'waitress',
     'zope.cachedescriptors',
     'dogpile.cache',
     'dogpile.core'
 ]
 
 if is_windows:
     pass
 else:
     requirements.append('psutil')
     requirements.append('py-bcrypt')
 
 test_requirements = [
     'WebTest',
     'configobj',
     'cssselect',
     'flake8',
     'lxml',
     'mock',
     'pytest',
     'pytest-cov',
     'pytest-runner',
 ]
 
 setup_requirements = [
     'PasteScript',
     'pytest-runner',
 ]
 
 dependency_links = [
 ]
 
 classifiers = [
     'Development Status :: 6 - Mature',
     'Environment :: Web Environment',
     'Framework :: Pylons',
     'Intended Audience :: Developers',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     'Programming Language :: Python :: 2.7',
 ]
 
 
 # additional files from project that goes somewhere in the filesystem
 # relative to sys.prefix
 data_files = []
 
 # additional files that goes into package itself
 package_data = {'rhodecode': ['i18n/*/LC_MESSAGES/*.mo', ], }
 
 description = ('RhodeCode is a fast and powerful management tool '
                'for Mercurial and GIT with a built in push/pull server, '
                'full text search and code-review.')
 
 keywords = ' '.join([
     'rhodecode', 'rhodiumcode', 'mercurial', 'git', 'code review',
     'repo groups', 'ldap', 'repository management', 'hgweb replacement',
     'hgwebdir', 'gitweb replacement', 'serving hgweb',
 ])
 
 # long description
 README_FILE = 'README.rst'
 CHANGELOG_FILE = 'CHANGES.rst'
 try:
     long_description = open(README_FILE).read() + '\n\n' + \
         open(CHANGELOG_FILE).read()
 
 except IOError, err:
     sys.stderr.write(
         '[WARNING] Cannot find file specified as long_description (%s)\n or '
         'changelog (%s) skipping that file' % (README_FILE, CHANGELOG_FILE)
     )
     long_description = description
 
 # packages
 packages = find_packages()
 
 paster_commands = [
     'make-config=rhodecode.lib.paster_commands.make_config:Command',
     'setup-rhodecode=rhodecode.lib.paster_commands.setup_rhodecode:Command',
     'update-repoinfo=rhodecode.lib.paster_commands.update_repoinfo:Command',
     'cache-keys=rhodecode.lib.paster_commands.cache_keys:Command',
     'ishell=rhodecode.lib.paster_commands.ishell:Command',
     'upgrade-db=rhodecode.lib.dbmigrate:UpgradeDb',
     'celeryd=rhodecode.lib.celerypylons.commands:CeleryDaemonCommand',
 ]
 
 setup(
     name='rhodecode-enterprise-ce',
     version=__version__,
     description=description,
     long_description=long_description,
     keywords=keywords,
     license=__license__,
     author=__author__,
     author_email='[e-mail]',
     dependency_links=dependency_links,
     url=__url__,
     install_requires=requirements,
     tests_require=test_requirements,
     classifiers=classifiers,
     setup_requires=setup_requirements,
     data_files=data_files,
     packages=packages,
     include_package_data=True,
     package_data=package_data,
     message_extractors={
         'rhodecode': [
             ('**.py', 'python', None),
+            ('**.js', 'javascript', None),
             ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
             ('templates/**.html', 'mako', {'input_encoding': 'utf-8'}),
             ('public/**', 'ignore', None),
         ]
     },
     zip_safe=False,
     paster_plugins=['PasteScript', 'Pylons'],
     entry_points={
         'enterprise.plugins1': [
             'crowd=rhodecode.authentication.plugins.auth_crowd:plugin_factory',
             'headers=rhodecode.authentication.plugins.auth_headers:plugin_factory',
             'jasig_cas=rhodecode.authentication.plugins.auth_jasig_cas:plugin_factory',
             'ldap=rhodecode.authentication.plugins.auth_ldap:plugin_factory',
             'pam=rhodecode.authentication.plugins.auth_pam:plugin_factory',
             'rhodecode=rhodecode.authentication.plugins.auth_rhodecode:plugin_factory',
             'token=rhodecode.authentication.plugins.auth_token:plugin_factory',
         ],
         'paste.app_factory': [
             'main=rhodecode.config.middleware:make_pyramid_app',
             'pylons=rhodecode.config.middleware:make_app',
         ],
         'paste.app_install': [
             'main=pylons.util:PylonsInstaller',
             'pylons=pylons.util:PylonsInstaller',
         ],
         'paste.global_paster_command': paster_commands,
         'pytest11': [
             'pylons=rhodecode.tests.pylons_plugin',
             'enterprise=rhodecode.tests.plugin',
         ],
         'console_scripts': [
             'rcserver=rhodecode.rcserver:main',
         ],
         'beaker.backends': [
             'memorylru_base=rhodecode.lib.memory_lru_debug:MemoryLRUNamespaceManagerBase',
             'memorylru_debug=rhodecode.lib.memory_lru_debug:MemoryLRUNamespaceManagerDebug'
         ]
     },
 )