You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/10/03 12:25:14 UTC
[1/4] syncope git commit: [SYNCOPE-946] i18n handling of confirmation
message
Repository: syncope
Updated Branches:
refs/heads/2_0_X 720794a6c -> baa7600b6
refs/heads/master b244c6144 -> f68588007
[SYNCOPE-946] i18n handling of confirmation message
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/97bdc567
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/97bdc567
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/97bdc567
Branch: refs/heads/2_0_X
Commit: 97bdc56760b6f3219e27268a992f533689fd881e
Parents: 720794a
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Oct 3 13:56:03 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Oct 3 13:56:03 2016 +0200
----------------------------------------------------------------------
.../resources/META-INF/resources/app/languages/de/static.json | 3 +--
.../resources/META-INF/resources/app/languages/en/static.json | 2 +-
.../resources/META-INF/resources/app/languages/it/static.json | 1 +
.../META-INF/resources/app/views/dynamicPlainAttribute.html | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/97bdc567/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
index d5a1e46..9c800db 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
+++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
@@ -42,8 +42,7 @@
"SUCCESSFULLY_UPDATED": "succesvol ge�pdatet",
"PASSWORD_UPDATED": ": password succesfully updated",
"GOBACKHOME": "Klik op deze link om terug te gaan naar de home page",
+ "CONFIRM_REMOVE": "This will remove the current value. Continue?",
"own": "Besitzen"
-
-
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/97bdc567/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
index 007cf48..543803e 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
+++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
@@ -42,7 +42,7 @@
"SUCCESSFULLY_UPDATED": "succesfully updated",
"PASSWORD_UPDATED": ": password succesfully updated",
"GOBACKHOME": "Click on this link to go back to the home page",
+ "CONFIRM_REMOVE": "This will remove the current value. Continue?",
"own": "Own"
-
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/97bdc567/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
index a5921b4..d1fee7c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
+++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
@@ -41,5 +41,6 @@
"SUCCESSFULLY_UPDATED": "aggiornato con successo",
"PASSWORD_UPDATED": ": password succesfully updated",
"GOBACKHOME": "Clicca su questo link per tornare alla home page",
+ "CONFIRM_REMOVE": "Questa azione rimuover� il valore corrente. Continuare?",
"own": "Propri"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/97bdc567/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
index fbdf0a2..b840463 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
@@ -26,13 +26,14 @@ under the License.
<div ng-switch-when="Encrypted" class="input-group input-group-sm">
<span class="input-group-btn">
<button type="button" class="btn btn-default btn-flat"
+ confirm="{{'CONFIRM_REMOVE'| translate}}"
onclick="var pwd = $(this).parent().next('input');
if (pwd.is('[readonly]')) {
if (pwd.val() === '') {
pwd.removeAttr('readonly');
$(this).children().attr('class', 'fa fa-unlock');
} else {
- var response = confirm('This will remove the current value. Continue?');
+ var response = confirm($(this).attr('confirm'));
if (response == true) {
pwd.removeAttr('readonly');
pwd.val('');
[4/4] syncope git commit: Fixing test execution
Posted by il...@apache.org.
Fixing test execution
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f6858800
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f6858800
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f6858800
Branch: refs/heads/master
Commit: f685880073618e31ef3cf99d17dd6b2bdc1133d1
Parents: ba07ea7
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Oct 3 14:24:49 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Oct 3 14:25:03 2016 +0200
----------------------------------------------------------------------
.../org/apache/syncope/client/enduser/protractor/tests/create.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f6858800/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
index 52674c7..27ead15 100644
--- a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
+++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
@@ -50,6 +50,8 @@ describe('syncope enduser user create', function () {
element.all(by.id('next')).first().click();
//plainSchemas
+ abstract.waitSpinner();
+ browser.wait(element(by.name('fullname')).isPresent());
element.all(by.name('fullname')).first().sendKeys('Gaetano Donizetti');
element.all(by.name('userId')).first().sendKeys('donizetti@apache.org');
element.all(by.name('firstname')).first().sendKeys('Gaetano');
[3/4] syncope git commit: Fixing test execution
Posted by il...@apache.org.
Fixing test execution
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/baa7600b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/baa7600b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/baa7600b
Branch: refs/heads/2_0_X
Commit: baa7600b65f3a2c0f51bb759bde73da4e6d09ae6
Parents: 97bdc56
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Oct 3 14:24:49 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Oct 3 14:24:49 2016 +0200
----------------------------------------------------------------------
.../org/apache/syncope/client/enduser/protractor/tests/create.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/baa7600b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
index 52674c7..27ead15 100644
--- a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
+++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
@@ -50,6 +50,8 @@ describe('syncope enduser user create', function () {
element.all(by.id('next')).first().click();
//plainSchemas
+ abstract.waitSpinner();
+ browser.wait(element(by.name('fullname')).isPresent());
element.all(by.name('fullname')).first().sendKeys('Gaetano Donizetti');
element.all(by.name('userId')).first().sendKeys('donizetti@apache.org');
element.all(by.name('firstname')).first().sendKeys('Gaetano');
[2/4] syncope git commit: [SYNCOPE-946] i18n handling of confirmation
message
Posted by il...@apache.org.
[SYNCOPE-946] i18n handling of confirmation message
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ba07ea78
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ba07ea78
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ba07ea78
Branch: refs/heads/master
Commit: ba07ea78a933b7c316511b1512b534730405a468
Parents: b244c61
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Mon Oct 3 13:56:03 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Oct 3 13:56:18 2016 +0200
----------------------------------------------------------------------
.../resources/META-INF/resources/app/languages/de/static.json | 3 +--
.../resources/META-INF/resources/app/languages/en/static.json | 2 +-
.../resources/META-INF/resources/app/languages/it/static.json | 1 +
.../META-INF/resources/app/views/dynamicPlainAttribute.html | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ba07ea78/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
index d5a1e46..9c800db 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
+++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json
@@ -42,8 +42,7 @@
"SUCCESSFULLY_UPDATED": "succesvol ge�pdatet",
"PASSWORD_UPDATED": ": password succesfully updated",
"GOBACKHOME": "Klik op deze link om terug te gaan naar de home page",
+ "CONFIRM_REMOVE": "This will remove the current value. Continue?",
"own": "Besitzen"
-
-
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ba07ea78/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
index 007cf48..543803e 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
+++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json
@@ -42,7 +42,7 @@
"SUCCESSFULLY_UPDATED": "succesfully updated",
"PASSWORD_UPDATED": ": password succesfully updated",
"GOBACKHOME": "Click on this link to go back to the home page",
+ "CONFIRM_REMOVE": "This will remove the current value. Continue?",
"own": "Own"
-
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ba07ea78/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
index a5921b4..d1fee7c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
+++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json
@@ -41,5 +41,6 @@
"SUCCESSFULLY_UPDATED": "aggiornato con successo",
"PASSWORD_UPDATED": ": password succesfully updated",
"GOBACKHOME": "Clicca su questo link per tornare alla home page",
+ "CONFIRM_REMOVE": "Questa azione rimuover� il valore corrente. Continuare?",
"own": "Propri"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/ba07ea78/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
index fbdf0a2..b840463 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
@@ -26,13 +26,14 @@ under the License.
<div ng-switch-when="Encrypted" class="input-group input-group-sm">
<span class="input-group-btn">
<button type="button" class="btn btn-default btn-flat"
+ confirm="{{'CONFIRM_REMOVE'| translate}}"
onclick="var pwd = $(this).parent().next('input');
if (pwd.is('[readonly]')) {
if (pwd.val() === '') {
pwd.removeAttr('readonly');
$(this).children().attr('class', 'fa fa-unlock');
} else {
- var response = confirm('This will remove the current value. Continue?');
+ var response = confirm($(this).attr('confirm'));
if (response == true) {
pwd.removeAttr('readonly');
pwd.val('');