Remove 'safety number approval' option from settings dialog

Also sync templates in test/index.html and background.html

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-06-14 10:45:13 -07:00
parent 9204188aa3
commit c7e385eb38
4 changed files with 6 additions and 22 deletions

View file

@ -594,14 +594,6 @@
"message": "Play audio notification", "message": "Play audio notification",
"description": "Description for audio notification setting" "description": "Description for audio notification setting"
}, },
"safetyNumbersSettingHeader": {
"message": "Safety numbers approval",
"description": "Header for safety numbers setting"
},
"safetyNumbersSettingDescription": {
"message": "Require approval of new safety numbers when they change",
"description": "Description for safety numbers setting"
},
"keychanged": { "keychanged": {
"message": "Your safety number with $name$ has changed. Click to verify.", "message": "Your safety number with $name$ has changed. Click to verify.",
"description": "", "description": "",

View file

@ -480,12 +480,6 @@
<input type='checkbox' name='audio-notification' id='audio-notification'/> <input type='checkbox' name='audio-notification' id='audio-notification'/>
<label for='audio-notification'>{{ audioNotificationDescription }}</label> <label for='audio-notification'>{{ audioNotificationDescription }}</label>
</div> </div>
<hr>
<div class='safety-numbers-settings'>
<h3>{{ safetyNumbersSettingHeader }}</h3>
<input type='checkbox' name='safety-numbers-approval' id='safety-numbers-approval'/>
<label for='safety-numbers-approval'>{{ safetyNumbersSettingDescription }}</label>
</div>
</div> </div>
</script> </script>
<script type='text/x-tmpl-mustache' id='syncSettings'> <script type='text/x-tmpl-mustache' id='syncSettings'>

View file

@ -64,11 +64,6 @@
defaultValue: false, defaultValue: false,
name: 'audio-notification' name: 'audio-notification'
}); });
new CheckboxView({
el: this.$('.safety-numbers-settings'),
defaultValue: true,
name: 'safety-numbers-approval'
});
if (textsecure.storage.user.getDeviceId() != '1') { if (textsecure.storage.user.getDeviceId() != '1') {
var syncView = new SyncView().render(); var syncView = new SyncView().render();
this.$('.content').append(syncView.el); this.$('.content').append(syncView.el);
@ -87,8 +82,6 @@
nameAndMessage: i18n('nameAndMessage'), nameAndMessage: i18n('nameAndMessage'),
noNameOrMessage: i18n('noNameOrMessage'), noNameOrMessage: i18n('noNameOrMessage'),
nameOnly: i18n('nameOnly'), nameOnly: i18n('nameOnly'),
safetyNumbersSettingDescription: i18n('safetyNumbersSettingDescription'),
safetyNumbersSettingHeader: i18n('safetyNumbersSettingHeader'),
audioNotificationDescription: i18n('audioNotificationDescription'), audioNotificationDescription: i18n('audioNotificationDescription'),
themeAndroidDark: i18n('themeAndroidDark'), themeAndroidDark: i18n('themeAndroidDark'),
}; };

View file

@ -450,6 +450,11 @@
<label for='notification-setting-off'>{{ disableNotifications }} </label> <label for='notification-setting-off'>{{ disableNotifications }} </label>
</div> </div>
</div> </div>
<br />
<div class='audio-notification-setting'>
<input type='checkbox' name='audio-notification' id='audio-notification'/>
<label for='audio-notification'>{{ audioNotificationDescription }}</label>
</div>
</div> </div>
</script> </script>
<script type='text/x-tmpl-mustache' id='syncSettings'> <script type='text/x-tmpl-mustache' id='syncSettings'>