[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 2 commits - loleaflet/dist loleaflet/.gitignore

[Andras Timar]

 loleaflet/.gitignore            |    2 +-
 loleaflet/dist/errormessages.js |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit dbc729a59598a4b7fee3746d8e3934fecfc99070
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon May 23 23:53:32 2016 +0200

    loleaflet: add dist/errormessages.js
    
    (cherry picked from commit 58c65fbca492edafbf3ce04c54b5c159713a0d2d)

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
new file mode 100644
index 0000000..6fa628b
--- /dev/null
+++ b/loleaflet/dist/errormessages.js
@@ -0,0 +1,2 @@
+var wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: file_path=/path/to/doc/');
+var emptyhosturl = _('The host URL is empty. The loolwsd server is probably misconfigured, please contact the administrator.');
commit 6b1d8d9cb313ed696652cbc6d5ec3e5b90005777
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon May 23 23:53:08 2016 +0200

    loleaflet: don't ignore errormessages.js
    
    (cherry picked from commit 240ce7e8e9198d0355cb96699847faf1100cf6af)

diff --git a/loleaflet/.gitignore b/loleaflet/.gitignore
index 5b195c2..edf8521 100644
--- a/loleaflet/.gitignore
+++ b/loleaflet/.gitignore
@@ -11,7 +11,7 @@ component.json
 _site
 dist/*.js
 dist/branding.css
-dist/branding.js
+!dist/errormessages.js
 dist/images/toolbar-bg.png
 dist/admin/*.js
 dist/plugins/