Merge branch 'soon' into staging

pull/1/head
ansuz 4 years ago
commit 47f043f3d7

@ -12,6 +12,8 @@ define([
Messages, nThen) { Messages, nThen) {
var Properties = {}; var Properties = {};
Messages.documentID = Messages.documentID || 'Document identifier'; // XXX
var getPadProperties = function (Env, data, opts, _cb) { var getPadProperties = function (Env, data, opts, _cb) {
var cb = Util.once(Util.mkAsync(_cb)); var cb = Util.once(Util.mkAsync(_cb));
var common = Env.common; var common = Env.common;
@ -19,6 +21,13 @@ define([
var $d = $('<div>'); var $d = $('<div>');
if (!data) { return void cb(void 0, $d); } if (!data) { return void cb(void 0, $d); }
if (data.channel) {
$('<label>', { 'for': 'cp-app-prop-id'}).text(Messages.documentID).appendTo($d);
$d.append(UI.dialog.selectable(data.channel, {
id: 'cp-app-prop-id',
}));
}
if (data.href) { if (data.href) {
$('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d); $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);
$d.append(UI.dialog.selectable(data.href, { $d.append(UI.dialog.selectable(data.href, {

@ -1468,5 +1468,6 @@
"loading_state_0": "Construction de l'interface", "loading_state_0": "Construction de l'interface",
"tag_edit": "Modifier", "tag_edit": "Modifier",
"tag_add": "Ajouter", "tag_add": "Ajouter",
"error_unhelpfulScriptError": "Erreur de script : consultez la console du navigateur pour plus de détails" "error_unhelpfulScriptError": "Erreur de script : consultez la console du navigateur pour plus de détails",
"documentID": "Référence du document"
} }

@ -1468,5 +1468,6 @@
"loading_state_5": "Reconstruct document", "loading_state_5": "Reconstruct document",
"tag_add": "Add", "tag_add": "Add",
"tag_edit": "Edit", "tag_edit": "Edit",
"error_unhelpfulScriptError": "Script Error: See browser console for details" "error_unhelpfulScriptError": "Script Error: See browser console for details",
"documentID": "Document identifier"
} }

Loading…
Cancel
Save