Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
Adding Angular-translate and a start to translate labels
Browse files Browse the repository at this point in the history
  • Loading branch information
sweco-semhul committed Apr 10, 2014
1 parent 9fac2c2 commit faf1bbe
Show file tree
Hide file tree
Showing 13 changed files with 1,184 additions and 108 deletions.
2 changes: 2 additions & 0 deletions Gruntfile.coffee
Expand Up @@ -93,6 +93,8 @@ module.exports = (grunt) ->
'static/build/js/vendor.min.js': [
'static/vendor/jquery/*.js'
'static/vendor/angular/*.js'
'static/vendor/angular-translate/*.js'
'static/vendor/angular-translate-loader-url/*.js'
'static/vendor/*/{,*/}*.js'
]

Expand Down
2 changes: 2 additions & 0 deletions bower.json
Expand Up @@ -7,6 +7,8 @@
"angular": "~1.2.1",
"angular-ui-utils": "~0.1.0",
"angular-bootstrap": "~0.10.0",
"angular-translate": "~2.1.0",
"angular-translate-loader-url": "~2.1.0",
"bootstrap": "~3.1.1",
"font-awesome": "~4.0.3",
"jKey": "OscarGodson/jKey#d2b426b20a6f786b8bc2b0842e2b394dd0744a29",
Expand Down
8 changes: 8 additions & 0 deletions examples/translations/label_se.json
@@ -0,0 +1,8 @@
{
"LABEL": {
"record": {
"about.instanceTitle.titleValue": "Huvudtitel"
}
}

}
16 changes: 14 additions & 2 deletions kitin.py
Expand Up @@ -142,8 +142,6 @@ def do_search(service_path):
# ----------------------------
# SEARCH END



# RECORD START
# ----------------------------

Expand Down Expand Up @@ -356,6 +354,20 @@ def delete_draft(rec_type, draft_id):



# TRANSLATION START
# ----------------------------
# MOVE INTO DEF?
@app.route("/translation/", methods=["GET"])
@login_required
def get_labels():
language = request.args.get('lang')
if(language == 'se'):
return raw_json_response(open(os.path.join(here, "examples/translations/label_%s.json" % language), 'r').read())

# ----------------------------
# TRANSLATION END


@app.route("/def/<path:path>")
@login_required
def get_def(path):
Expand Down
25 changes: 17 additions & 8 deletions static/build/js/vendor.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/build/js/vendor.min.js.map

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions static/js/main.js
Expand Up @@ -4,14 +4,19 @@
*/

var kitin = angular.module('kitin', [
'ngRoute', 'infinite-scroll',
'ngRoute', 'infinite-scroll', 'pascalprecht.translate',
'ui.utils', 'ui.bootstrap',
'kitin.controllers', 'kitin.filters', 'kitin.services', 'kitin.directives']);

kitin.config(function($locationProvider, $routeProvider) {
kitin.config(function($locationProvider, $routeProvider, $translateProvider) {

$locationProvider.html5Mode(true).hashPrefix('!');

// add translation table
$translateProvider
.useUrlLoader('/translation')
.preferredLanguage('se');

$routeProvider
.when('/', { templateUrl: '/partials/index' })
.when('/search/:recType', { templateUrl: '/partials/search' })
Expand Down
2 changes: 1 addition & 1 deletion static/vendor/angular-route/angular-route.js
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.2.16-build.51+sha.69e5c36
* @license AngularJS v1.2.17-build.105+sha.1ebed26
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand Down
@@ -0,0 +1,27 @@
/*!
* angular-translate - v2.1.0 - 2014-04-02
* http://github.com/PascalPrecht/angular-translate
* Copyright (c) 2014 ; Licensed MIT
*/
angular.module('pascalprecht.translate').factory('$translateUrlLoader', [
'$q',
'$http',
function ($q, $http) {
return function (options) {
if (!options || !options.url) {
throw new Error('Couldn\'t use urlLoader since no url is given!');
}
var deferred = $q.defer();
$http({
url: options.url,
params: { lang: options.key },
method: 'GET'
}).success(function (data) {
deferred.resolve(data);
}).error(function (data) {
deferred.reject(options.key);
});
return deferred.promise;
};
}
]);

0 comments on commit faf1bbe

Please sign in to comment.