Merge pull request #135 from blumeva/staging

Staging

customize.dist/translations/messages.fr.js

@@ -214,6 +214,8 @@ define(function () {
     out.canvas_enable = "Activer le dessin";
     out.canvas_width = "Épaisseur";
     out.canvas_opacity = "Opacité";
+    out.canvas_opacityLabel = "opacité: {0}";
+    out.canvas_widthLabel = "taille: {0}";
 
     // File manager
 

customize.dist/translations/messages.js

@@ -216,6 +216,9 @@ define(function () {
     out.canvas_enable = "Enable draw";
     out.canvas_width = "Width";
     out.canvas_opacity = "Opacity";
+    out.canvas_opacityLabel = "opacity: {0}";
+    out.canvas_widthLabel = "Width: {0}";
+    
 
     // File manager
 

www/whiteboard/main.js

@@ -97,7 +97,7 @@ window.canvas = canvas;
         var updateBrushWidth = function () {
             var val = $width.val();
             canvas.freeDrawingBrush.width = Number(val);
-            $widthLabel.text(val);
+            $widthLabel.text(Cryptpad.Messages._getKey("canvas_widthLabel", [val]));
             createCursor();
         };
         updateBrushWidth();
@@ -108,7 +108,7 @@ window.canvas = canvas;
             var val = $opacity.val();
             brush.opacity = Number(val);
             canvas.freeDrawingBrush.color = Colors.hex2rgba(brush.color, brush.opacity);
-            $opacityLabel.text(val);
+            $opacityLabel.text(Cryptpad.Messages._getKey("canvas_opacityLabel", [val]));
             createCursor();
         };
         updateBrushOpacity();