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

Merge branch 'release-0.24'

pull/222/merge
Simon Eisenmann 10 years ago
parent
ad6891b0e2 85b6d0859e
commit
0b57f6c805
14 changed files with 121 additions and 42 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. 6
      src/app/spreed-webrtc-server/room_manager.go
  2. 26
      src/i18n/messages-de.po
  3. 23
      src/i18n/messages-ja.po
  4. 23
      src/i18n/messages-ko.po
  5. 23
      src/i18n/messages-zh-cn.po
  6. 23
      src/i18n/messages-zh-tw.po
  7. 22
      src/i18n/messages.pot
  8. 5
      static/js/directives/settings.js
  9. 2
      static/js/services/constraints.js
  10. 2
      static/translation/messages-de.json
  11. 2
      static/translation/messages-ja.json
  12. 2
      static/translation/messages-ko.json
  13. 2
      static/translation/messages-zh-cn.json
  14. 2
      static/translation/messages-zh-tw.json

6
src/app/spreed-webrtc-server/room_manager.go
Unescape View File

@ -65,7 +65,9 @@ func NewRoomManager(config *Config, encoder OutgoingEncoder) RoomManager { @@ -65,7 +65,9 @@ func NewRoomManager(config *Config, encoder OutgoingEncoder) RoomManager {
OutgoingEncoder: encoder,
roomTable: make(map[string]RoomWorker),
}
rm.globalRoomID = rm.MakeRoomID(config.globalRoomID, "")
if config.globalRoomID != "" {
rm.globalRoomID = rm.MakeRoomID(config.globalRoomID, "")
}
rm.defaultRoomID = rm.MakeRoomID("", "")
return rm
}
@ -120,7 +122,7 @@ func (rooms *roomManager) Broadcast(sessionID, roomID string, outgoing *DataOutg @@ -120,7 +122,7 @@ func (rooms *roomManager) Broadcast(sessionID, roomID string, outgoing *DataOutg
return
}
if roomID != "" && roomID == rooms.globalRoomID {
if roomID == rooms.globalRoomID {
rooms.RLock()
for _, room := range rooms.roomTable {
room.Broadcast(sessionID, message)

26
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: 2015-07-08 11:02+0200\n"
"PO-Revision-Date: 2015-07-08 11:02+0100\n"
"POT-Creation-Date: 2015-07-29 11:32+0200\n"
"PO-Revision-Date: 2015-07-29 11:40+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"
@ -279,6 +279,9 @@ msgstr "" @@ -279,6 +279,9 @@ msgstr ""
msgid "Share"
msgstr "Teilen"
msgid "OK"
msgstr "OK"
msgid "Profile"
msgstr "Profil"
@ -365,8 +368,8 @@ msgstr "Standard Raum" @@ -365,8 +368,8 @@ msgstr "Standard Raum"
msgid "Set alternative room to join at start."
msgstr " Raum wird beim Start automatisch betreten."
msgid "Notification sounds"
msgstr "Klänge"
msgid "Notifications"
msgstr "Benachrichtigungen"
msgid "Desktop notification"
msgstr "Desktop-Benachrichtigung"
@ -380,6 +383,15 @@ msgstr "Verweigert - prüfen Sie die Browser-Einstellungen" @@ -380,6 +383,15 @@ msgstr "Verweigert - prüfen Sie die Browser-Einstellungen"
msgid "Allowed"
msgstr "Aktiviert"
msgid "Sounds for incoming messages"
msgstr "Töne bei eingehenden Nachrichten"
msgid "Ring on incoming calls"
msgstr "Klingeln bei eingehenden Anrufen"
msgid "Sounds for users in current room"
msgstr "Töne für Nutzer im aktuellen Raum"
msgid "Advanced settings"
msgstr "Erweiterte Einstellungen"
@ -619,6 +631,9 @@ msgstr "Ihre Kontaktanfrage wurde abgelehnt." @@ -619,6 +631,9 @@ msgstr "Ihre Kontaktanfrage wurde abgelehnt."
msgid "Edit Contact"
msgstr "Kontakt bearbeiten"
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "Ihr Browser unterstützt kein WebRTC. Keine Anrufe möglich."
msgid "Close this window and disconnect?"
msgstr "Fenster schließen und die Verbindung trennen?"
@ -668,9 +683,6 @@ msgstr "" @@ -668,9 +683,6 @@ 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."
msgid "Chat with"
msgstr "Chat mit"

23
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: 2015-07-08 11:02+0200\n"
"POT-Creation-Date: 2015-07-29 11:32+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"
@ -275,6 +275,9 @@ msgstr "" @@ -275,6 +275,9 @@ msgstr ""
msgid "Share"
msgstr "共有取り消し"
msgid "OK"
msgstr ""
msgid "Profile"
msgstr ""
@ -358,7 +361,7 @@ msgid "Set alternative room to join at start." @@ -358,7 +361,7 @@ msgid "Set alternative room to join at start."
msgstr "スタート時に別のルームに参加する."
#, fuzzy
msgid "Notification sounds"
msgid "Notifications"
msgstr "デスクトップ通知"
msgid "Desktop notification"
@ -373,6 +376,16 @@ msgstr "拒否 - ブラウザ設定を確認して下さい" @@ -373,6 +376,16 @@ msgstr "拒否 - ブラウザ設定を確認して下さい"
msgid "Allowed"
msgstr "許可"
msgid "Sounds for incoming messages"
msgstr ""
#, fuzzy
msgid "Ring on incoming calls"
msgstr "着信中"
msgid "Sounds for users in current room"
msgstr ""
msgid "Advanced settings"
msgstr "詳細設定"
@ -605,6 +618,9 @@ msgstr "" @@ -605,6 +618,9 @@ msgstr ""
msgid "Edit Contact"
msgstr ""
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "ブラウザがWebRTCをサポートしていない為通話はできません."
msgid "Close this window and disconnect?"
msgstr ""
@ -653,9 +669,6 @@ msgstr "から電話がありました." @@ -653,9 +669,6 @@ 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 "ブラウザがWebRTCをサポートしていない為通話はできません."
msgid "Chat with"
msgstr "とチャットする"

23
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: 2015-07-08 11:02+0200\n"
"POT-Creation-Date: 2015-07-29 11:32+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"
@ -275,6 +275,9 @@ msgstr "" @@ -275,6 +275,9 @@ msgstr ""
msgid "Share"
msgstr "비공유"
msgid "OK"
msgstr ""
msgid "Profile"
msgstr ""
@ -358,7 +361,7 @@ msgid "Set alternative room to join at start." @@ -358,7 +361,7 @@ msgid "Set alternative room to join at start."
msgstr "시작시에 다른 방에 합류하도록 설정 되었습니다"
#, fuzzy
msgid "Notification sounds"
msgid "Notifications"
msgstr "데스크탑에 통보"
msgid "Desktop notification"
@ -373,6 +376,16 @@ msgstr "거부됨 - 브라우저 설정을 확인하세요" @@ -373,6 +376,16 @@ msgstr "거부됨 - 브라우저 설정을 확인하세요"
msgid "Allowed"
msgstr "허락됨"
msgid "Sounds for incoming messages"
msgstr ""
#, fuzzy
msgid "Ring on incoming calls"
msgstr "전화 걸려옴"
msgid "Sounds for users in current room"
msgstr ""
msgid "Advanced settings"
msgstr "고급 설정"
@ -605,6 +618,9 @@ msgstr "" @@ -605,6 +618,9 @@ msgstr ""
msgid "Edit Contact"
msgstr ""
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "브라우저가 WebRTC를 지원하지 않습니다. 전화걸기가 불가능 합니다."
msgid "Close this window and disconnect?"
msgstr ""
@ -653,9 +669,6 @@ msgstr "전화 드렸습니다." @@ -653,9 +669,6 @@ 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 "브라우저가 WebRTC를 지원하지 않습니다. 전화걸기가 불가능 합니다."
msgid "Chat with"
msgstr "대화하기"

23
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: 2015-07-08 11:02+0200\n"
"POT-Creation-Date: 2015-07-29 11:32+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"
@ -275,6 +275,9 @@ msgstr "" @@ -275,6 +275,9 @@ msgstr ""
msgid "Share"
msgstr "停止分享"
msgid "OK"
msgstr ""
msgid "Profile"
msgstr ""
@ -358,7 +361,7 @@ msgid "Set alternative room to join at start." @@ -358,7 +361,7 @@ msgid "Set alternative room to join at start."
msgstr "重设初始默认房间"
#, fuzzy
msgid "Notification sounds"
msgid "Notifications"
msgstr "桌面提醒"
msgid "Desktop notification"
@ -373,6 +376,16 @@ msgstr "被拒绝--请检查浏览器设置" @@ -373,6 +376,16 @@ msgstr "被拒绝--请检查浏览器设置"
msgid "Allowed"
msgstr "启用"
msgid "Sounds for incoming messages"
msgstr ""
#, fuzzy
msgid "Ring on incoming calls"
msgstr "来电"
msgid "Sounds for users in current room"
msgstr ""
msgid "Advanced settings"
msgstr "高级设置"
@ -605,6 +618,9 @@ msgstr "" @@ -605,6 +618,9 @@ msgstr ""
msgid "Edit Contact"
msgstr ""
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "您的浏览器不支持WebRTC。不能进行通话。"
msgid "Close this window and disconnect?"
msgstr ""
@ -653,9 +669,6 @@ msgstr " 曾与您通话。" @@ -653,9 +669,6 @@ 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 "您的浏览器不支持WebRTC。不能进行通话。"
msgid "Chat with"
msgstr "与**聊天"

23
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: 2015-07-08 11:02+0200\n"
"POT-Creation-Date: 2015-07-29 11:32+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"
@ -275,6 +275,9 @@ msgstr "" @@ -275,6 +275,9 @@ msgstr ""
msgid "Share"
msgstr "停止分享"
msgid "OK"
msgstr ""
msgid "Profile"
msgstr ""
@ -358,7 +361,7 @@ msgid "Set alternative room to join at start." @@ -358,7 +361,7 @@ msgid "Set alternative room to join at start."
msgstr "重設初始默認房間"
#, fuzzy
msgid "Notification sounds"
msgid "Notifications"
msgstr "桌面提醒"
msgid "Desktop notification"
@ -373,6 +376,16 @@ msgstr "被拒絕﹣請檢查瀏覽器設置" @@ -373,6 +376,16 @@ msgstr "被拒絕﹣請檢查瀏覽器設置"
msgid "Allowed"
msgstr "啟用"
msgid "Sounds for incoming messages"
msgstr ""
#, fuzzy
msgid "Ring on incoming calls"
msgstr "來電"
msgid "Sounds for users in current room"
msgstr ""
msgid "Advanced settings"
msgstr "高級設置"
@ -605,6 +618,9 @@ msgstr "" @@ -605,6 +618,9 @@ msgstr ""
msgid "Edit Contact"
msgstr ""
msgid "Your browser does not support WebRTC. No calls possible."
msgstr "您的遊覽器不支持WebRTC。不能進行通話。"
msgid "Close this window and disconnect?"
msgstr ""
@ -653,9 +669,6 @@ msgstr " 曾與您通話" @@ -653,9 +669,6 @@ 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 "您的遊覽器不支持WebRTC。不能進行通話。"
msgid "Chat with"
msgstr "于＊＊聊天"

22
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: 2015-07-08 11:02+0200\n"
"POT-Creation-Date: 2015-07-29 11:32+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"
@ -268,6 +268,9 @@ msgstr "" @@ -268,6 +268,9 @@ msgstr ""
msgid "Share"
msgstr ""
msgid "OK"
msgstr ""
msgid "Profile"
msgstr ""
@ -350,7 +353,7 @@ msgstr "" @@ -350,7 +353,7 @@ msgstr ""
msgid "Set alternative room to join at start."
msgstr ""
msgid "Notification sounds"
msgid "Notifications"
msgstr ""
msgid "Desktop notification"
@ -365,6 +368,15 @@ msgstr "" @@ -365,6 +368,15 @@ msgstr ""
msgid "Allowed"
msgstr ""
msgid "Sounds for incoming messages"
msgstr ""
msgid "Ring on incoming calls"
msgstr ""
msgid "Sounds for users in current room"
msgstr ""
msgid "Advanced settings"
msgstr ""
@ -594,6 +606,9 @@ msgstr "" @@ -594,6 +606,9 @@ msgstr ""
msgid "Edit Contact"
msgstr ""
msgid "Your browser does not support WebRTC. No calls possible."
msgstr ""
msgid "Close this window and disconnect?"
msgstr ""
@ -639,9 +654,6 @@ msgstr "" @@ -639,9 +654,6 @@ 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 ""
msgid "Chat with"
msgstr ""

5
static/js/directives/settings.js
Unescape View File

@ -209,6 +209,8 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t @@ -209,6 +209,8 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
// https://code.google.com/p/webrtc/source/browse/trunk/talk/app/webrtc/localaudiosource.cc (audio constraints)
// https://code.google.com/p/webrtc/source/browse/trunk/talk/app/webrtc/webrtcsession.cc (pc constraints)
c.add("pc", "googCpuOveruseDetection", settings.videoCpuOveruseDetection && true); // defaults to true in Chrome
// Experimental audio settings.
if (settings.experimental.enabled) {
c.add("audio", "googEchoCancellation", true); // defaults to true
@ -216,7 +218,7 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t @@ -216,7 +218,7 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
c.add("audio", "googAutoGainControl", true); // defaults to true
c.add("audio", "googAutoGainControl2", settings.experimental.audioAutoGainControl2 && true); // defaults to false in Chrome
c.add("audio", "googNoiseSuppression", true); // defaults to true
c.add("audio", "googgNoiseSuppression2", settings.experimental.audioNoiseSuppression2 && true); // defaults to false in Chrome
c.add("audio", "googNoiseSuppression2", settings.experimental.audioNoiseSuppression2 && true); // defaults to false in Chrome
c.add("audio", "googHighpassFilter", true); // defaults to true
c.add("audio", "googTypingNoiseDetection", settings.experimental.audioTypingNoiseDetection && true); // defaults to true in Chrome
}
@ -239,7 +241,6 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t @@ -239,7 +241,6 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
c.add(["video", "screensharing"], "googLeakyBucket", settings.experimental.videoLeakyBucket && true); // defaults to false in Chrome
// Removes the noise in the captured video stream at the expense of CPU.
c.add(["video", "screensharing"], "googNoiseReduction", settings.experimental.videoNoiseReduction && true); // defaults to false in Chrome
c.add("pc", "googCpuOveruseDetection", settings.experimental.videoCpuOveruseDetection && true); // defaults to true in Chrome
}

2
static/js/services/constraints.js
Unescape View File

@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
// Optional constraints are arrays.
var d = {};
d[k] = v;
obj.push(d)
obj.push(d);
}
}
};

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