En picks/land more

pootle/__version__.py

@@ -21,6 +21,6 @@
 """This file contains the version of Pootle."""
 
 
-build = 25202
+build = 25203
 sver = "2.5.2-alpha1"
 ver = (2, 5, 2)

pootle/apps/pootle_misc/upgrade/pootle.py

@@ -118,3 +118,17 @@ def upgrade_to_25202():
     from pootle.core.initdb import create_system_user
 
     create_system_user()
+
+
+def upgrade_to_25203():
+    """Set `Submission` model's type to the new `SubmissionTypes.SYSTEM` for
+    submissions performed by the `system` user.
+    """
+    from pootle_statistics.models import Submission, SubmissionTypes
+
+    Submission.objects.filter(
+        type=None,
+        submitter__user__username='system',
+    ).update(
+        type=SubmissionTypes.SYSTEM,
+    )

pootle/apps/pootle_statistics/models.py

@@ -34,6 +34,7 @@ class SubmissionTypes(object):
     REVERT = 2  # Revert action on the web
     SUGG_ACCEPT = 3  # Accepting a suggestion
     UPLOAD = 4  # Uploading an offline file
+    SYSTEM = 5  # Batch actions performed offline
 
 
 class SubmissionFields(object):

pootle/apps/pootle_store/models.py

@@ -1453,7 +1453,7 @@ def update(self, update_structure=False, update_translation=False,
                                 submitter=system,
                                 unit=unit,
                                 field=SubmissionFields.TARGET,
-                                type=None,
+                                type=SubmissionTypes.SYSTEM,
                                 old_value=old_target_f,
                                 new_value=unit.target_f
                             )

pootle/apps/pootle_store/views.py

@@ -633,9 +633,14 @@ def timeline(request, unit):
     from pootle_store.fields import to_python
 
     for key, values in groupby(timeline, key=lambda x: x.creation_time):
+        # Under Windows, the "nl_langinfo" method is not available
+        try:
+            time_str = key.strftime(locale.nl_langinfo(locale.D_T_FMT))
+        except NameError:
+            time_str = key
         entry_group = {
             'datetime': key,
-            'datetime_str': key.strftime(locale.nl_langinfo(locale.D_T_FMT)),
+            'datetime_str': time_str,
             'entries': [],
         }
 

pootle/settings/90-dev-local.conf.sample

@@ -24,6 +24,11 @@ DEBUG = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
 TEMPLATE_DEBUG = DEBUG
 
+# A list of strings representing the host/domain names that this Pootle server
+# can serve. This is a Django's security measure. More details at
+# https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = ['127.0.0.1', 'localhost']
+
 
 #
 # Backends

pootle/static/css/style.css

@@ -795,7 +795,8 @@ html[dir="rtl"] td.username
 
 tr.even,
 td.even,
-li.even
+li.even,
+tr.view-row:nth-child(odd)
 {
     background: #f8f8f8;
 }

pootle/static/js/editor.js

@@ -952,9 +952,9 @@
 
 
   /* Builds a single row */
-  buildRow: function (unit, cls) {
+  buildRow: function (unit) {
     return [
-      '<tr id="row', unit.id, '" class="view-row ', cls ,'">',
+      '<tr id="row', unit.id, '" class="view-row">',
         this.tmpl.vUnit({unit: unit.toJSON()}),
       '</tr>'
     ].join('');
@@ -965,8 +965,6 @@
     var unitGroups = this.getUnitGroups(),
         groupSize = _.size(unitGroups),
         currentUnit = this.units.getCurrent(),
-        cls = "even",
-        even = true,
         rows = [],
         i, unit;
 
@@ -986,11 +984,8 @@
         if (unit.id === currentUnit.id) {
           rows.push(this.getEditUnit());
         } else {
-          rows.push(this.buildRow(unit, cls));
+          rows.push(this.buildRow(unit));
         }
-
-        cls = even ? "odd" : "even";
-        even = !even;
       }
     }, this);
 
@@ -1002,22 +997,16 @@
   buildCtxRows: function (units, extraCls) {
     var i, unit,
         currentUnit = this.units.getCurrent(),
-        cls = "even",
-        even = true,
         rows = '';
 
     for (i=0; i<units.length; i++) {
       // FIXME: Please let's use proper models for context units
       unit = units[i];
       unit = $.extend({}, currentUnit.toJSON(), unit);
 
-      rows += '<tr id="ctx' + unit.id + '" class="ctx-row ' + extraCls +
-              ' ' + cls + '">';
+      rows += '<tr id="ctx' + unit.id + '" class="ctx-row ' + extraCls + '">';
       rows += this.tmpl.vUnit({unit: unit});
       rows += '</tr>';
-
-      cls = even ? "odd" : "even";
-      even = !even;
     }
 
     return rows;
@@ -1725,9 +1714,11 @@
     }
 
     var uid = PTL.editor.units.getCurrent().id,
-        node = $("#extras-container"),
+        node = $(".translate-container"),
         timelineUrl = l(['/xhr/units/', uid, '/timeline/'].join(''));
 
+    node.spin();
+
     // Always abort previous requests so we only get results for the
     // current unit
     if (PTL.editor.timelineReq != null) {
@@ -1756,9 +1747,6 @@
           $("#js-hide-timeline").show();
         }
       },
-      beforeSend: function () {
-        node.spin();
-      },
       complete: function () {
         node.spin(false);
       },

pootle/static/js/vendor/sorttable.js

@@ -1,4 +1,9 @@
 /*
+  Modifications:
+  Copyright 2013 Evernote Corporation
+
+  ***
+
   SortTable
   version 2
   7th April 2007
@@ -50,8 +55,6 @@ sorttable = {
     // Safari doesn't support table.tHead, sigh
     if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0];
 
-    if (table.tHead.rows.length != 1) return; // can't cope with two header rows
-
     // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as
     // "total" rows, for example). This is B&R, since what you're supposed
     // to do is put them in a tfoot. So, if there are sortbottom rows,

pootle/templates/layout.html

@@ -99,7 +99,11 @@
     $(function() {
       $("[title], [original-title]").tipsy({
         gravity: $.fn.tipsy.autoBounds(150, 'n'),
-        html: true, fade: true, delayIn: 750, live: true});
+        html: true,
+        fade: true,
+        delayIn: 750,
+        opacity: 1,
+        live: true});
       $.ajaxSetup({ traditional: true });
       $.ajaxPrefilter(function (options, originalOptions) {
         if (options.type === 'post' || options.type === 'POST') {