Browse Source

Rename actionResetUserData() to actionResetUser() and reset-data to reset-user to stop confusion.

No functional change, also renamed string names:
privacyStatusResetData -> privacyStatusResetUser
privacyStatusResetDataDescription-> privacyStatusResetUserDescription
1.1.101
Jorg Knobloch 1 year ago
parent
commit
5cf81a0b72
5 changed files with 17 additions and 17 deletions
  1. +2
    -2
      addon/_locales/de/messages.json
  2. +2
    -2
      addon/_locales/en/messages.json
  3. +3
    -3
      addon/content/dialogs/privacy_status.js
  4. +9
    -9
      addon/content/dialogs/privacy_status.xhtml
  5. +1
    -1
      addon/content/modules/handshake.js

+ 2
- 2
addon/_locales/de/messages.json View File

@ -290,10 +290,10 @@
"privacyStatusResetTrust": {
"message": "Vertrauen zurücksetzen"
},
"privacyStatusResetDataDescription": {
"privacyStatusResetUserDescription": {
"message": "Den p≡p-Status dieses Kommunikationspartners zurücksetzen"
},
"privacyStatusResetData": {
"privacyStatusResetUser": {
"message": "Zurücksetzen"
},
"privacyStatusSecureDescription": {


+ 2
- 2
addon/_locales/en/messages.json View File

@ -290,10 +290,10 @@
"privacyStatusResetTrust": {
"message": "Reset Trust"
},
"privacyStatusResetDataDescription": {
"privacyStatusResetUserDescription": {
"message": "Reset all p≡p data for this communication partner"
},
"privacyStatusResetData": {
"privacyStatusResetUser": {
"message": "Reset"
},
"privacyStatusSecureDescription": {


+ 3
- 3
addon/content/dialogs/privacy_status.js View File

@ -139,7 +139,7 @@ var pEpPrivacyStatus = {
handlers: {
// Reset Trust is apparently not required.
// "reset-trust": this.executeHandler(this.handshake.actionResetTrust.bind(this.handshake, otherIdentity)),
"button#reset-data": this.executeHandler(this.handshake.actionResetUserData.bind(this.handshake, otherIdentity)),
"button#reset-user": this.executeHandler(this.handshake.actionResetUser.bind(this.handshake, otherIdentity)),
},
});
} else if (color == "yellow") {
@ -175,7 +175,7 @@ var pEpPrivacyStatus = {
handlers: {
"button#accept-trust": this.executeHandler(this.handshake.actionTrustKey.bind(this.handshake, otherIdentity)),
"button#reject-trust": this.executeHandler(this.handshake.actionMistrustKey.bind(this.handshake, otherIdentity)),
"button#reset-data": this.executeHandler(this.handshake.actionResetUserData.bind(this.handshake, otherIdentity)),
"button#reset-user": this.executeHandler(this.handshake.actionResetUser.bind(this.handshake, otherIdentity)),
"checkbox#full-trustwords":
this.executeHandler2(this.handshake.fullTrustwords, this.ownIdentity, otherIdentity),
"menulist#language-selector":
@ -192,7 +192,7 @@ var pEpPrivacyStatus = {
adjustments: {
},
handlers: {
"button#reset-data": this.executeHandler(this.handshake.actionResetUserData.bind(this.handshake, otherIdentity)),
"button#reset-user": this.executeHandler(this.handshake.actionResetUser.bind(this.handshake, otherIdentity)),
},
});
}


+ 9
- 9
addon/content/dialogs/privacy_status.xhtml View File

@ -66,10 +66,10 @@
</html:div>
<html:div class="actions">
<hbox>
<html:label data-localekey="privacyStatusResetDataDescription"></html:label>
<html:button id="reset-data"
<html:label data-localekey="privacyStatusResetUserDescription"></html:label>
<html:button id="reset-user"
class="action reset"
data-localekey="privacyStatusResetData">
data-localekey="privacyStatusResetUser">
</html:button>
</hbox>
</html:div>
@ -93,10 +93,10 @@
-->
<html:div class="actions">
<hbox>
<html:label data-localekey="privacyStatusResetDataDescription"></html:label>
<html:button id="reset-data"
<html:label data-localekey="privacyStatusResetUserDescription"></html:label>
<html:button id="reset-user"
class="action reset"
data-localekey="privacyStatusResetData">
data-localekey="privacyStatusResetUser">
</html:button>
</hbox>
</html:div>
@ -111,10 +111,10 @@
</html:div>
<html:div class="actions">
<hbox>
<html:label data-localekey="privacyStatusResetDataDescription"></html:label>
<html:button id="reset-data"
<html:label data-localekey="privacyStatusResetUserDescription"></html:label>
<html:button id="reset-user"
class="action reset"
data-localekey="privacyStatusResetData">
data-localekey="privacyStatusResetUser">
</html:button>
</hbox>
</html:div>


+ 1
- 1
addon/content/modules/handshake.js View File

@ -23,7 +23,7 @@ class Handshake {
return this.controller.key_reset_trust(identity);
}
async actionResetUserData(identity) {
async actionResetUser(identity) {
return this.controller.key_reset_user(identity);
}


Loading…
Cancel
Save