Translate remains of scope form and some other fixes.

pull/763/head
Fredrik Jönsson 2015-02-07 09:04:00 +01:00
parent fdc9a65ec1
commit 73a4533906
5 changed files with 31 additions and 11 deletions

View File

@ -286,7 +286,9 @@ var BlackListListView = Backbone.View.extend({
}
$('#loadingbox').sheet('show');
$('#loading').html('<span class="label" id="loading-blacklist">Blacklist</span> ');
$('#loading').html(
'<span class="label" id="loading-blacklist">' + $.t('admin.blacklist') + '</span> '
);
$.when(this.model.fetchIfNeeded()).done(function() {
$('#loading-blacklist').addClass('label-success');
@ -303,7 +305,9 @@ var BlackListListView = Backbone.View.extend({
e.preventDefault();
var _self = this;
$('#loadingbox').sheet('show');
$('#loading').html('<span class="label" id="loading-scopes">Blacklist</span> ');
$('#loading').html(
'<span class="label" id="loading-blacklist">' + $.t('admin.blacklist') + '</span> '
);
$.when(this.model.fetch()).done(function() {
$('#loadingbox').sheet('hide');

View File

@ -1,5 +1,6 @@
{
"admin": {
"blacklist": "Blacklist",
"blacklist-form": {
"blacklisted-uris": "Blacklisted URIs"
},
@ -67,13 +68,18 @@
"icon": "Icon",
"new": "New Scope",
"select-icon": "Select an icon",
"structured": "is a structured scope",
"structured-help": "Is the scope structured with structured values like <code>base:extension</code>?",
"structured-param-help": "Human-readable description of the structured parameter",
"value": "Scope value",
"value-help": "Single string with no spaces",
"value-placeholder": "scope"
},
"system-scope-table": {
"confirm": "Are you sure sure you would like to delete this scope? Clients that have this scope will still be able to ask for it.",
"new": "New Scope",
"text": "There are no system scopes defined. Clients may still have custom scopes."
"text": "There are no system scopes defined. Clients may still have custom scopes.",
"tooltip-dynamic": "This scope can be used by dynamically registered clients"
}
},
"token": {

View File

@ -1,5 +1,6 @@
{
"admin": {
"blacklist": "Svartlista",
"blacklist-form": {
"blacklisted-uris": "Svarlistade URIer"
},
@ -67,13 +68,18 @@
"icon": "Ikon",
"new": "Nytt scope",
"select-icon": "Välj en ikon",
"structured": "är ett scope med struktur",
"structured-help": "Har detta scope strukturerade värden som <code>base:extension</code>?",
"structured-param-help": "Läsbar och begriplig beskrivning av den strukturerade parametern",
"value": "Scope-värde",
"value-help": "Ett ord utan mellanslag",
"value-placeholder": "scope"
},
"system-scope-table": {
"confirm": "Är du säker på att du vill ta bort detta scope? Klienter som har detta scope kommer att kunna fortsätta att begära det.",
"new": "Nytt scope",
"text": "Det finns inga system-scope definierade. Klienter kan ändå ha speciellt anpassade scope."
"text": "Det finns inga system-scope definierade. Klienter kan ändå ha speciellt anpassade scope.",
"tooltip-dynamic": "Detta scope är tillgängligt för dynamiskt registrerade klienter"
}
},
"token": {

View File

@ -99,7 +99,7 @@ var SystemScopeView = Backbone.View.extend({
render:function (eventName) {
this.$el.html(this.template(this.model.toJSON()));
this.$('.allow-dyn-reg').tooltip({title: 'This scope can be used by dynamically registered clients'});
this.$('.allow-dyn-reg').tooltip({title: $.t('scope.system-scope-table.tooltip-dynamic')});
return this;
$(this.el).i18n();
@ -108,7 +108,7 @@ var SystemScopeView = Backbone.View.extend({
deleteScope:function (e) {
e.preventDefault();
if (confirm("Are you sure sure you would like to delete this scope? Clients that have this scope will still be able to ask for it.")) {
if (confirm($.t("scope.system-scope-table.confirm"))) {
var _self = this;
this.model.destroy({
@ -164,7 +164,9 @@ var SystemScopeListView = Backbone.View.extend({
}
$('#loadingbox').sheet('show');
$('#loading').html('<span class="label" id="loading-scopes">Scopes</span> ');
$('#loading').html(
'<span class="label" id="loading-scopes">' + $.t('common.scopes') + '</span> '
);
$.when(this.model.fetchIfNeeded({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
.done(function() {
@ -186,7 +188,9 @@ var SystemScopeListView = Backbone.View.extend({
refreshTable:function(e) {
var _self = this;
$('#loadingbox').sheet('show');
$('#loading').html('<span class="label" id="loading-scopes">Scopes</span> ');
$('#loading').html(
'<span class="label" id="loading-scopes">' + $.t('common.scopes') + '</span> '
);
$.when(this.model.fetch({success:function(e) {$('#loading-scopes').addClass('label-success');}}))
.done(function() {

View File

@ -153,13 +153,13 @@
<div class="control-group">
<div class="controls" id="isStructured">
<label class="checkbox">
<input type="checkbox" <%-structured ? 'checked' : '' %>> is a structured scope
<input type="checkbox" <%-structured ? 'checked' : '' %>> <span data-i18n="scope.system-scope-form.structured">is a structured scope</span>
</label>
<p class="help-block">Is the scope structured with structured values like <code>base:extension</code>?</p>
<p class="help-block" data-i18n="[html]scope.system-scope-form.structured-help">Is the scope structured with structured values like <code>base:extension</code>?</p>
</div>
<div class="controls" id="structuredParamDescription">
<input type="text" value="<%-structuredParamDescription ? structuredParamDescription : '' %>">
<p class="help-block">Human-readable description of the structured parameter</p>
<p class="help-block" data-i18n="scope.system-scope-form.structured-param-help">Human-readable description of the structured parameter</p>
</div>
</div>