diff --git a/app/channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js
index 1936d2a2066b..eb5896ec578c 100644
--- a/app/channel-settings/client/views/channelSettings.js
+++ b/app/channel-settings/client/views/channelSettings.js
@@ -62,7 +62,7 @@ function roomExcludePinned(room) {
return room.retention.excludePinned;
}
- return settings.get('RetentionPolicy_ExcludePinned');
+ return settings.get('RetentionPolicy_DoNotPrunePinned');
}
function roomHasGlobalPurge(room) {
diff --git a/app/discussion/server/config.js b/app/discussion/server/config.js
index d5ed8ee0a2a5..61f6d0d10ce1 100644
--- a/app/discussion/server/config.js
+++ b/app/discussion/server/config.js
@@ -27,23 +27,23 @@ Meteor.startup(() => {
value: true,
};
- settings.add('RetentionPolicy_DoNotExcludeDiscussion', true, {
+ settings.add('RetentionPolicy_DoNotPruneDiscussion', true, {
group: 'RetentionPolicy',
section: 'Global Policy',
type: 'boolean',
public: true,
- i18nLabel: 'RetentionPolicy_DoNotExcludeDiscussion',
- i18nDescription: 'RetentionPolicy_DoNotExcludeDiscussion_Description',
+ i18nLabel: 'RetentionPolicy_DoNotPruneDiscussion',
+ i18nDescription: 'RetentionPolicy_DoNotPruneDiscussion_Description',
enableQuery: globalQuery,
});
- settings.add('RetentionPolicy_DoNotExcludeThreads', true, {
+ settings.add('RetentionPolicy_DoNotPruneThreads', true, {
group: 'RetentionPolicy',
section: 'Global Policy',
type: 'boolean',
public: true,
- i18nLabel: 'RetentionPolicy_DoNotExcludeThreads',
- i18nDescription: 'RetentionPolicy_DoNotExcludeThreads_Description',
+ i18nLabel: 'RetentionPolicy_DoNotPruneThreads',
+ i18nDescription: 'RetentionPolicy_DoNotPruneThreads_Description',
enableQuery: globalQuery,
});
});
diff --git a/app/retention-policy/server/cronPruneMessages.js b/app/retention-policy/server/cronPruneMessages.js
index ad374d9e4767..cb5b0fab1865 100644
--- a/app/retention-policy/server/cronPruneMessages.js
+++ b/app/retention-policy/server/cronPruneMessages.js
@@ -21,9 +21,9 @@ const toDays = (d) => d * 1000 * 60 * 60 * 24;
function job() {
const now = new Date();
const filesOnly = settings.get('RetentionPolicy_FilesOnly');
- const excludePinned = settings.get('RetentionPolicy_ExcludePinned');
- const ignoreDiscussion = settings.get('RetentionPolicy_DoNotExcludeDiscussion');
- const ignoreThreads = settings.get('RetentionPolicy_DoNotExcludeThreads');
+ const excludePinned = settings.get('RetentionPolicy_DoNotPrunePinned');
+ const ignoreDiscussion = settings.get('RetentionPolicy_DoNotPruneDiscussion');
+ const ignoreThreads = settings.get('RetentionPolicy_DoNotPruneThreads');
// get all rooms with default values
types.forEach((type) => {
diff --git a/app/retention-policy/server/startup/settings.js b/app/retention-policy/server/startup/settings.js
index b6b7946a6d69..6389cbe6b551 100644
--- a/app/retention-policy/server/startup/settings.js
+++ b/app/retention-policy/server/startup/settings.js
@@ -91,10 +91,10 @@ settings.addGroup('RetentionPolicy', function() {
}, globalQuery],
});
- this.add('RetentionPolicy_ExcludePinned', false, {
+ this.add('RetentionPolicy_DoNotPrunePinned', false, {
type: 'boolean',
public: true,
- i18nLabel: 'RetentionPolicy_ExcludePinned',
+ i18nLabel: 'RetentionPolicy_DoNotPrunePinned',
enableQuery: globalQuery,
});
this.add('RetentionPolicy_FilesOnly', false, {
diff --git a/app/ui-clean-history/client/views/cleanHistory.html b/app/ui-clean-history/client/views/cleanHistory.html
index de5cec6b2c0f..27f9a9a7bc64 100644
--- a/app/ui-clean-history/client/views/cleanHistory.html
+++ b/app/ui-clean-history/client/views/cleanHistory.html
@@ -64,17 +64,17 @@