From fa161e849b5b4b1c85db004d9fec021ce34eaf96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 25 May 2015 16:24:11 +0200 Subject: [PATCH] f7ed1c695d857e86a203cf9aa2593d04fa6dbfd0 --- dist/index.html | 6 +- dist/js/app-loader.js | 2 +- dist/js/app.js | 13 +- dist/js/libs.js | 2 +- dist/js/maps/app.js.map | 2 +- dist/js/maps/libs.js.map | 2 +- dist/js/templates.js | 30 ++--- dist/locales/locale-ca.json | 114 +++++++++--------- dist/locales/locale-fi.json | 200 +++++++++++++++---------------- dist/locales/locale-fr.json | 102 ++++++++-------- dist/locales/locale-zh-hant.json | 86 ++++++------- dist/styles/main.css | 4 +- 12 files changed, 284 insertions(+), 279 deletions(-) diff --git a/dist/index.html b/dist/index.html index d564457..52f0232 100644 --- a/dist/index.html +++ b/dist/index.html @@ -158,8 +158,8 @@

- - - + + + \ No newline at end of file diff --git a/dist/js/app-loader.js b/dist/js/app-loader.js index ddf503f..d164025 100644 --- a/dist/js/app-loader.js +++ b/dist/js/app-loader.js @@ -1,7 +1,7 @@ (function() { var promise, version; - version = 1432197929797; + version = 1432563821968; window.taigaConfig = { "api": "http://localhost:8000/api/v1/", diff --git a/dist/js/app.js b/dist/js/app.js index 7b542cf..7060caa 100644 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -2502,23 +2502,28 @@ return container.replaceWith(dom); }; videoConferenceUrl = function(project) { - var baseUrl, url, urlSeparator; - urlSeparator = "-"; + var baseUrl, url, urlFixer; + urlFixer = function(url) { + return url; + }; if (project.videoconferences === "appear-in") { baseUrl = "https://appear.in/"; } else if (project.videoconferences === "talky") { baseUrl = "https://talky.io/"; } else if (project.videoconferences === "jitsi") { - urlSeparator = ""; baseUrl = "https://meet.jit.si/"; + urlFixer = function(url) { + return url.replace(/ /g, "").replace(/-/g, ""); + }; } else { return ""; } if (project.videoconferences_salt) { - url = "" + project.slug + urlSeparator + project.videoconferences_salt; + url = project.slug + "-" + project.videoconferences_salt; } else { url = "" + project.slug; } + url = urlFixer(url); return baseUrl + url; }; link = function($scope, $el, $attrs, $ctrl) { diff --git a/dist/js/libs.js b/dist/js/libs.js index bc94123..245bfb5 100644 --- a/dist/js/libs.js +++ b/dist/js/libs.js @@ -23,7 +23,7 @@ case"mm":return result+=1===number?"minuta":2===number||3===number||4===number?" },container:function(element){return element.parent()},errorsWrapper:"