pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Added checkt for Websocket support and show warning message if the browser does not support websockets.

pull/69/head
Simon Eisenmann 11 years ago
parent
0424635e15
commit
72aaadadeb
13 changed files with 82 additions and 146 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/i18n/messages-de.po
  2. 34
      src/i18n/messages-ja.po
  3. 34
      src/i18n/messages-ko.po
  4. 34
      src/i18n/messages-zh-cn.po
  5. 34
      src/i18n/messages-zh-tw.po
  6. 28
      src/i18n/messages.pot
  7. 8
      static/js/controllers/mediastreamcontroller.js
  8. 8
      static/js/services/mediastream.js
  9. 2
      static/translation/messages-de.json
  10. 2
      static/translation/messages-ja.json
  11. 2
      static/translation/messages-ko.json
  12. 2
      static/translation/messages-zh-cn.json
  13. 2
      static/translation/messages-zh-tw.json

38
src/i18n/messages-de.po
Unescape View File

@ -8,8 +8,8 @@ msgid "" @@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-06-23 12:33+0200\n"
"PO-Revision-Date: 2014-06-23 12:37+0100\n"
"POT-Creation-Date: 2014-07-07 12:43+0200\n"
"PO-Revision-Date: 2014-07-07 12:44+0100\n"
"Last-Translator: Simon Eisenmann <simon@struktur.de>\n"
"Language-Team: struktur AG <opensource@struktur.de>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@ -354,33 +354,14 @@ msgstr "Hier klicken für weitere Infos (Google Chrome)." @@ -354,33 +354,14 @@ msgstr "Hier klicken für weitere Infos (Google Chrome)."
msgid "Please set your user details and settings."
msgstr "Bitte vervollständigen Sie Ihre Daten und Einstellungen."
msgid ""
"Please note that some settings require you to reload or to make a new "
"call to become effective."
msgstr ""
"Bitte beachten Sie, dass einige Einstellungen erst nach einem Reload oder"
" einem neuen Anruf aktiv werden."
msgid "Create your room"
msgid "Create a room and talk together"
msgstr "Erstellen Sie Ihren Raum"
msgid "This is your room link:"
msgstr "Ihre Raum-Addresse:"
msgid "Creating room link ..."
msgstr "Raum-Link wird erstellt ..."
msgid "Start"
msgstr "Start"
msgid "Creating room ..."
msgstr "Raum wird erstellt ..."
msgid "Just click start"
msgstr "Klicken Sie auf Start"
msgid "Share this URL with the people you want to meet."
msgstr "Teilen Sie die Raum-Adresse mit anderen Kontakten."
msgid "You can use and re-use this room as many times as you want."
msgstr "Sie können diesen Raum so oft wieder benutzen wie Sie möchten."
msgid "Create"
msgstr "Erstellen"
msgid "Peer to peer chat active."
msgstr "Peer-to-peer Chat ist aktiv."
@ -459,6 +440,11 @@ msgstr " hat versucht Sie anzurufen." @@ -459,6 +440,11 @@ msgstr " hat versucht Sie anzurufen."
msgid " called you."
msgstr " hat Sie angerufen."
msgid "Your browser is not supported. Please upgrade to a current version."
msgstr ""
"Ihr Browser wird nicht unterstützt. Bitte aktualisieren Sie auf eine "
"aktuelle Version."
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "Ihr Browser unterstützt kein WebRTC. Keine Anrufe möglich."

34
src/i18n/messages-ja.po
Unescape View File

@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-06-23 12:33+0200\n"
"POT-Creation-Date: 2014-07-07 12:43+0200\n"
"PO-Revision-Date: 2014-04-23 22:25+0100\n"
"Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -349,31 +349,15 @@ msgstr "ここをクリックしてヘルプ表示(Google Chrome)" @@ -349,31 +349,15 @@ msgstr "ここをクリックしてヘルプ表示(Google Chrome)"
msgid "Please set your user details and settings."
msgstr "あなたのプロフィールとアプリの動作を設定してください."
msgid ""
"Please note that some settings require you to reload or to make a new "
"call to become effective."
msgstr "いくつかの設定は、再読み込みもしくは次回の発信から有効です."
msgid "Create your room"
msgstr "自分のルームを作成する"
msgid "This is your room link:"
msgstr "あなたのルームへのリンク:"
msgid "Create a room and talk together"
msgstr ""
msgid "Creating room link ..."
#, fuzzy
msgid "Creating room ..."
msgstr "ルームへのリンクを作る..."
msgid "Start"
msgstr "開始"
msgid "Just click start"
msgstr "クリックして開始"
msgid "Share this URL with the people you want to meet."
msgstr "会いたい人とURLをシェアする."
msgid "You can use and re-use this room as many times as you want."
msgstr "ルームは何回でも好きなだけ使えます."
msgid "Create"
msgstr ""
msgid "Peer to peer chat active."
msgstr "ピア・ツー・ピア・チャットがアクティブです."
@ -450,6 +434,10 @@ msgstr "は電話しようとしました." @@ -450,6 +434,10 @@ msgstr "は電話しようとしました."
msgid " called you."
msgstr "から電話がありました."
#, fuzzy
msgid "Your browser is not supported. Please upgrade to a current version."
msgstr "ブラウザがファイル転送をサポートしていません."
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "ブラウザがWebRTCをサポートしていない為通話はできません."

34
src/i18n/messages-ko.po
Unescape View File

@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-06-23 12:33+0200\n"
"POT-Creation-Date: 2014-07-07 12:43+0200\n"
"PO-Revision-Date: 2014-04-13 20:30+0900\n"
"Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -349,31 +349,15 @@ msgstr "도움말을 원하면 여기를 클릭 하세요 (구글 크롬)" @@ -349,31 +349,15 @@ msgstr "도움말을 원하면 여기를 클릭 하세요 (구글 크롬)"
msgid "Please set your user details and settings."
msgstr "사용자의 세부상세와 설정을 지정하세요 "
msgid ""
"Please note that some settings require you to reload or to make a new "
"call to become effective."
msgstr "일부 설정은 다시로드 하거나 새로운 전화가 연결시에 유효할수 있습니다."
msgid "Create your room"
msgstr "새로운 방 만들기"
msgid "This is your room link:"
msgstr "당신의 방 링크:"
msgid "Create a room and talk together"
msgstr ""
msgid "Creating room link ..."
#, fuzzy
msgid "Creating room ..."
msgstr "방 링크 만들기..."
msgid "Start"
msgstr "시작"
msgid "Just click start"
msgstr "시작하기 클릭"
msgid "Share this URL with the people you want to meet."
msgstr "이 URL을 만나고 싶은 사람과 공유하기"
msgid "You can use and re-use this room as many times as you want."
msgstr "당신은 이 방을 원하는 횟수 만큼 사용할 수 있습니다"
msgid "Create"
msgstr ""
msgid "Peer to peer chat active."
msgstr "일대일 대화 활성화"
@ -450,6 +434,10 @@ msgstr "연결을 시도 중입니다" @@ -450,6 +434,10 @@ msgstr "연결을 시도 중입니다"
msgid " called you."
msgstr "전화 드렸습니다."
#, fuzzy
msgid "Your browser is not supported. Please upgrade to a current version."
msgstr "당신의 브라우저가 회일전송을 지원하지 않습니다."
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "브라우저가 WebRTC를 지원하지 않습니다. 전화걸기가 불가능 합니다."

34
src/i18n/messages-zh-cn.po
Unescape View File

@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-06-23 12:33+0200\n"
"POT-Creation-Date: 2014-07-07 12:43+0200\n"
"PO-Revision-Date: 2014-05-21 09:54+0800\n"
"Last-Translator: Michael P.\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -349,31 +349,15 @@ msgstr "点击这里获取帮助 (Google Chrome)" @@ -349,31 +349,15 @@ msgstr "点击这里获取帮助 (Google Chrome)"
msgid "Please set your user details and settings."
msgstr "请设定您的用户信息及设置"
msgid ""
"Please note that some settings require you to reload or to make a new "
"call to become effective."
msgstr "请注意，有些设置需要重新加载或开始新的通话后才能生效。"
msgid "Create your room"
msgstr "创建您的房间"
msgid "This is your room link:"
msgstr "这是您的房间链接"
msgid "Create a room and talk together"
msgstr ""
msgid "Creating room link ..."
#, fuzzy
msgid "Creating room ..."
msgstr "创建房间链接"
msgid "Start"
msgstr "开始"
msgid "Just click start"
msgstr "直接点击开始"
msgid "Share this URL with the people you want to meet."
msgstr "请与您需要联系的人分享此URL "
msgid "You can use and re-use this room as many times as you want."
msgstr "您可使用或反复多次使用此房间"
msgid "Create"
msgstr ""
msgid "Peer to peer chat active."
msgstr "P2P聊天已启动"
@ -450,6 +434,10 @@ msgstr " 曾呼叫您。" @@ -450,6 +434,10 @@ msgstr " 曾呼叫您。"
msgid " called you."
msgstr " 曾与您通话。"
#, fuzzy
msgid "Your browser is not supported. Please upgrade to a current version."
msgstr "您的浏览器不支持文件传输"
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "您的浏览器不支持WebRTC。不能进行通话。"

34
src/i18n/messages-zh-tw.po
Unescape View File

@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-06-23 12:33+0200\n"
"POT-Creation-Date: 2014-07-07 12:43+0200\n"
"PO-Revision-Date: 2014-05-21 09:55+0800\n"
"Last-Translator: Michael P.\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -349,31 +349,15 @@ msgstr "點擊這裡獲取幫助 (Google Chrome)" @@ -349,31 +349,15 @@ msgstr "點擊這裡獲取幫助 (Google Chrome)"
msgid "Please set your user details and settings."
msgstr "請設定您的用戶信息及設置"
msgid ""
"Please note that some settings require you to reload or to make a new "
"call to become effective."
msgstr "請注意，有些設置需要重新加載或開始新的通話後才能生效。"
msgid "Create your room"
msgstr "穿件您的房间"
msgid "This is your room link:"
msgstr "這是您的房間鏈接："
msgid "Create a room and talk together"
msgstr ""
msgid "Creating room link ..."
#, fuzzy
msgid "Creating room ..."
msgstr "創建房間連接 ..."
msgid "Start"
msgstr "開始"
msgid "Just click start"
msgstr "直接點擊開始"
msgid "Share this URL with the people you want to meet."
msgstr "請與您需要聯繫的人分享此URL"
msgid "You can use and re-use this room as many times as you want."
msgstr "您可使用或反復多次使用此房間"
msgid "Create"
msgstr ""
msgid "Peer to peer chat active."
msgstr "P2P聊天啟動"
@ -450,6 +434,10 @@ msgstr " 曾呼叫您" @@ -450,6 +434,10 @@ msgstr " 曾呼叫您"
msgid " called you."
msgstr " 曾與您通話"
#, fuzzy
msgid "Your browser is not supported. Please upgrade to a current version."
msgstr "您的遊覽器不支持文件傳輸"
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "您的遊覽器不支持WebRTC。不能進行通話。"

28
src/i18n/messages.pot
Unescape View File

@ -9,7 +9,7 @@ msgid "" @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-06-23 12:33+0200\n"
"POT-Creation-Date: 2014-07-07 12:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -348,30 +348,13 @@ msgstr "" @@ -348,30 +348,13 @@ msgstr ""
msgid "Please set your user details and settings."
msgstr ""
msgid ""
"Please note that some settings require you to reload or to make a new "
"call to become effective."
msgstr ""
msgid "Create your room"
msgstr ""
msgid "This is your room link:"
msgstr ""
msgid "Creating room link ..."
msgid "Create a room and talk together"
msgstr ""
msgid "Start"
msgid "Creating room ..."
msgstr ""
msgid "Just click start"
msgstr ""
msgid "Share this URL with the people you want to meet."
msgstr ""
msgid "You can use and re-use this room as many times as you want."
msgid "Create"
msgstr ""
msgid "Peer to peer chat active."
@ -449,6 +432,9 @@ msgstr "" @@ -449,6 +432,9 @@ msgstr ""
msgid " called you."
msgstr ""
msgid "Your browser is not supported. Please upgrade to a current version."
msgstr ""
msgid "Your browser does not support WebRTC. No calls possible."
msgstr ""

8
static/js/controllers/mediastreamcontroller.js
Unescape View File

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
define(['underscore', 'bigscreen', 'moment', 'sjcl', 'webrtc.adapter'], function(_, BigScreen, moment, sjcl) {
define(['underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'webrtc.adapter'], function(_, BigScreen, moment, sjcl, Modernizr) {
return ["$scope", "$rootScope", "$element", "$window", "$timeout", "safeDisplayName", "safeApply", "mediaStream", "appData", "playSound", "desktopNotify", "alertify", "toastr", "translation", "fileDownload", "localStorage", function($scope, $rootScope, $element, $window, $timeout, safeDisplayName, safeApply, mediaStream, appData, playSound, desktopNotify, alertify, toastr, translation, fileDownload, localStorage) {
@ -792,8 +792,14 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'webrtc.adapter'], function @@ -792,8 +792,14 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'webrtc.adapter'], function
});
_.defer(function() {
if (!Modernizr.websockets) {
alertify.dialog.alert(translation._("Your browser is not supported. Please upgrade to a current version."));
$scope.setStatus("unsupported");
return;
}
if (!$window.webrtcDetectedVersion) {
alertify.dialog.alert(translation._("Your browser does not support WebRTC. No calls possible."));
return;
}
});

8
static/js/services/mediastream.js
Unescape View File

@ -22,12 +22,13 @@ define([ @@ -22,12 +22,13 @@ define([
'jquery',
'underscore',
'ua-parser',
'modernizr',
'mediastream/connector',
'mediastream/api',
'mediastream/webrtc',
'mediastream/tokens'
], function($, _, uaparser, Connector, Api, WebRTC, tokens) {
], function($, _, uaparser, Modernizr, Connector, Api, WebRTC, tokens) {
return ["globalContext", "$route", "$location", "$window", "visibility", "alertify", "$http", "safeApply", "$timeout", "$sce", "localStorage", function(context, $route, $location, $window, visibility, alertify, $http, safeApply, $timeout, $sce, localStorage) {
@ -204,6 +205,11 @@ define([ @@ -204,6 +205,11 @@ define([
$rootScope.roomstatus = false;
var connect = function() {
// We need websocket support to connect.
if (!Modernizr.websockets) {
console.error("This browser has no support for websockets. Connect aborted.");
return;
}
if (ready && cont) {
// Inject connector function into scope, so that controllers can pick it up.
safeApply($rootScope, function(scope) {

2
static/translation/messages-de.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-ja.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-ko.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-zh-cn.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-zh-tw.json
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save