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

Allow easy extensions of supported languages.

pull/17/merge
Simon Eisenmann 12 years ago
parent
65b45f5465
commit
a77297ab5a
10 changed files with 88 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      html/main.html
  2. 3
      src/app/spreed-speakfreely-server/main.go
  3. 8
      src/i18n/Makefile
  4. 13
      src/i18n/README.txt
  5. 18
      src/i18n/helpers/languages.py
  6. 41
      static/js/app.js
  7. 16
      static/js/directives/settings.js
  8. 4
      static/js/services/mediastream.js
  9. 6
      static/partials/settings.html
  10. 4
      static/translation/languages.js

2
html/main.html
Unescape View File

@ -1,5 +1,5 @@
<%define "mainPage"%><!doctype html> <%define "mainPage"%><!doctype html>
<html class="no-js" lang="<% index .Languages 0%>" itemscope="itemscope" itemtype="http://schema.org/WebPage"> <html class="no-js" itemscope="itemscope" itemtype="http://schema.org/WebPage">
<head> <head>
<%template "head" .%> <%template "head" .%>
</head> </head>

3
src/app/spreed-speakfreely-server/main.go
Unescape View File

@ -100,8 +100,7 @@ func handleRoomView(room string, w http.ResponseWriter, r *http.Request) {
} }
// Get languages from request. // Get languages from request.
// TODO(longsleep): Added supported and default language to configuration. langs := getRequestLanguages(r, []string{})
langs := getRequestLanguages(r, []string{"en", "de"})
if len(langs) == 0 { if len(langs) == 0 {
langs = append(langs, "en") langs = append(langs, "en")
} }

8
src/i18n/Makefile
Unescape View File

@ -8,6 +8,11 @@ ROOT := "$(CURDIR)/../.."
NODEJS := nodejs NODEJS := nodejs
PYBABEL := pybabel PYBABEL := pybabel
NODE_PATH := /usr/local/lib/node_modules:/usr/lib/node_modules NODE_PATH := /usr/local/lib/node_modules:/usr/lib/node_modules
PYTHON := python
build: update
NODE_PATH=$(NODE_PATH) $(NODEJS) helpers/po2json messages-de.po $(ROOT)/static/translation/messages-de.json
$(PYTHON) helpers/languages.py >$(ROOT)/static/translation/languages.js
extract: extract:
$(PYBABEL) extract -F babel.cfg -k _n:1,2 -k _ \ $(PYBABEL) extract -F babel.cfg -k _n:1,2 -k _ \
@ -24,6 +29,3 @@ extract:
update: update:
$(PYBABEL) update -l de -i messages.pot -o messages-de.po $(PYBABEL) update -l de -i messages.pot -o messages-de.po
build: update
NODE_PATH=$(NODE_PATH) $(NODEJS) helpers/po2json messages-de.po $(ROOT)/static/translation/messages-de.json

13
src/i18n/README.txt
Unescape View File

@ -0,0 +1,13 @@
Rebuild pot file from source (only do that on template or JavaScript changes)
``make extract``
Merge po files with pot file (always do this before translating)
``make update``
Create JavaScript translation fiels from po files (do this when finished translating)
``make build``
Create a new translation (obvious)
``cp messages.pot messages-$(ISO-639-1).po``
Add new ISO-639-1 line to helpers/languages.py including translated language name.
``make build``

18
src/i18n/helpers/languages.py
Unescape View File

@ -0,0 +1,18 @@
#!/usr/bin/python
# -*- coding: UTF-8 -*-
# Generate simple languages JSON module.
LANGUAGES = {
"en": "English",
"de": "Deutsch",
}
def main():
print """// This file is auto generated, do not modify.
define([], function() {
return %r;
});""" % LANGUAGES
if __name__ == "__main__":
main()

41
static/js/app.js
Unescape View File

@ -31,6 +31,8 @@ define([
'filters/filters', 'filters/filters',
'controllers/controllers', 'controllers/controllers',
'translation/languages',
'ui-bootstrap', 'ui-bootstrap',
'angular-sanitize', 'angular-sanitize',
'angular-animate', 'angular-animate',
@ -39,7 +41,7 @@ define([
'mobile-events', 'mobile-events',
'dialogs' 'dialogs'
], function(require, $, _, angular, modernizr, moment, services, directives, filters, controllers) { ], function(require, $, _, angular, modernizr, moment, services, directives, filters, controllers, languages) {
var initialize = function(ms) { var initialize = function(ms) {
@ -72,9 +74,14 @@ define([
mediaStream.initialize($rootScope, translation); mediaStream.initialize($rootScope, translation);
}]); }]);
app.constant("availableLanguages", languages);
angular.element(document).ready(function() { angular.element(document).ready(function() {
// Detect language. var globalContext = JSON.parse($("#globalcontext").text());
app.constant("globalContext", globalContext);
// Configure language.
var lang = (function() { var lang = (function() {
var lang; var lang;
var html = document.getElementsByTagName("html")[0]; var html = document.getElementsByTagName("html")[0];
@ -84,16 +91,28 @@ define([
lang = null; lang = null;
} }
} }
if (lang) { if (!lang) {
html.setAttribute("lang", lang); var browserLanguages = [];
return lang; // Expand browser languages with combined fallback.
} else { _.each(globalContext.Languages, function(l) {
try { browserLanguages.push(l);
return html.getAttribute("lang"); if (l.indexOf("-") != -1) {
} catch(e) { browserLanguages.push(l.split("-")[0])
return "en"; }
}; });
// Loop through browser languages and use first one we got.
for (var i=0; i<browserLanguages.length; i++) {
if (languages.hasOwnProperty(browserLanguages[i])) {
lang = browserLanguages[i];
break;
}
}
}
if (!lang) {
lang = "en";
} }
html.setAttribute("lang", lang);
return lang;
}()); }());
// Prepare bootstrap function with injected locale data. // Prepare bootstrap function with injected locale data.

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

@ -18,11 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
define(['text!partials/settings.html'], function(template) { define(['underscore', 'text!partials/settings.html'], function(_, template) {
return ["$compile", function($compile) { return ["$compile", function($compile) {
var controller = ['$scope', 'desktopNotify', 'mediaSources', 'safeApply', function($scope, desktopNotify, mediaSources, safeApply) { var controller = ['$scope', 'desktopNotify', 'mediaSources', 'safeApply', 'availableLanguages', 'translation', function($scope, desktopNotify, mediaSources, safeApply, availableLanguages, translation) {
$scope.layout.settings = false; $scope.layout.settings = false;
$scope.showAdvancedSettings = true; $scope.showAdvancedSettings = true;
@ -31,6 +31,18 @@ define(['text!partials/settings.html'], function(template) {
$scope.rememberSettings = true; $scope.rememberSettings = true;
$scope.desktopNotify = desktopNotify; $scope.desktopNotify = desktopNotify;
$scope.mediaSources = mediaSources; $scope.mediaSources = mediaSources;
$scope.availableLanguages = [
{
code: "",
name: translation._("Use browser language")
}
];
_.each(availableLanguages, function(name, code) {
$scope.availableLanguages.push({
code: code,
name: name
});
});
var localStream = null; var localStream = null;

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

@ -28,10 +28,8 @@ define([
], function($, _, Connector, Api, WebRTC, tokens) { ], function($, _, Connector, Api, WebRTC, tokens) {
return ["$route", "$location", "$window", "visibility", "alertify", "$http", "safeApply", "$timeout", function($route, $location, $window, visibility, alertify, $http, safeApply, $timeout) { return ["globalContext", "$route", "$location", "$window", "visibility", "alertify", "$http", "safeApply", "$timeout", function(context, $route, $location, $window, visibility, alertify, $http, safeApply, $timeout) {
var globalcontext = $("#globalcontext").text();
var context = JSON.parse(globalcontext);
var url = (context.Ssl ? "wss" : "ws") + "://" + context.Host + (context.Cfg.B || "/") + "ws"; var url = (context.Ssl ? "wss" : "ws") + "://" + context.Host + (context.Cfg.B || "/") + "ws";
var version = context.Cfg.Version || "unknown"; var version = context.Cfg.Version || "unknown";
console.log("Service version: "+version); console.log("Service version: "+version);

6
static/partials/settings.html
Unescape View File

@ -54,11 +54,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-xs-4 control-label">{{_('Language')}}</label> <label class="col-xs-4 control-label">{{_('Language')}}</label>
<div class="col-xs-8"> <div class="col-xs-8">
<select class="form-control" ng-model="user.settings.language"> <select class="form-control" ng-model="user.settings.language" ng-options="l.code as l.name for l in availableLanguages | orderBy:'code'"></select>
<option value="">{{_('Use browser language')}}</option>
<option value="de">Deutsch</option>
<option value="en">English</option>
</select>
<span class="help-block">{{_('Language changes become active on reload.')}}</span> <span class="help-block">{{_('Language changes become active on reload.')}}</span>
</div> </div>
</div> </div>

4
static/translation/languages.js
Unescape View File

@ -0,0 +1,4 @@
// This file is auto generated, do not modify.
define([], function() {
return {'de': 'Deutsch', 'en': 'English'};
});
Write Preview
Loading…
Cancel
Save