Skip to content
Snippets Groups Projects
Commit 5c632172 authored by Martin Schoeler's avatar Martin Schoeler
Browse files

fix wrong commit

parent f2165818
No related branches found
No related tags found
No related merge requests found
......@@ -14,7 +14,7 @@
<div class="section-content border-component-color">
<div class="alert pending-background pending-color pending-border">
<strong>
{{_ "Two-factor_authentication_native_mobile_app_warning"}}
WARNING: Once you enable this, you will not be able to login on the native mobile apps (Rocket.Chat+) using your password until they implement the 2FA.
</strong>
</div>
{{#if isEnabled}}
......
/* globals getEmojiUrlFromName:true, updateEmojiCustom:true, deleteEmojiCustom:true, isSetNotNull */
RocketChat.emoji.packages.emojiCustom = {
emojiCategories: { rocket: 'Custom' },
emojiCategories: { rocket: TAPi18n.__('Custom') },
toneList: {},
list: [],
......
......@@ -4,14 +4,14 @@
* Mapping category hashes into human readable and translated names
*/
emojiCategories = {
people: 'Smileys_and_People',
nature: 'Animals_and_Nature',
food: 'Food_and_Drink',
activity: 'Activity',
travel: 'Travel_and_Places',
objects: 'Objects',
symbols: 'Symbols',
flags: 'Flags'
people: TAPi18n.__('Smileys_and_People'),
nature: TAPi18n.__('Animals_and_Nature'),
food: TAPi18n.__('Food_and_Drink'),
activity: TAPi18n.__('Activity'),
travel: TAPi18n.__('Travel_and_Places'),
objects: TAPi18n.__('Objects'),
symbols: TAPi18n.__('Symbols'),
flags: TAPi18n.__('Flags')
};
toneList = {
......
......@@ -9,8 +9,7 @@ function categoryName(category) {
for (const emojiPackage in RocketChat.emoji.packages) {
if (RocketChat.emoji.packages.hasOwnProperty(emojiPackage)) {
if (RocketChat.emoji.packages[emojiPackage].emojiCategories.hasOwnProperty(category)) {
const categoryTag = RocketChat.emoji.packages[emojiPackage].emojiCategories[category];
return TAPi18n.__(categoryTag);
return RocketChat.emoji.packages[emojiPackage].emojiCategories[category];
}
}
}
......
RocketChat.emoji = {
packages: {
base: {
emojiCategories: { recent: 'Frequently_Used' },
emojiCategories: { recent: TAPi18n.__('Frequently_Used') },
emojisByCategory: {
recent: []
},
......
......@@ -1523,7 +1523,6 @@
"Two-factor_authentication_disabled": "Two-factor authentication disabled",
"Two-factor_authentication_enabled": "Two-factor authentication enabled",
"Two-factor_authentication_is_currently_disabled": "Two-factor authentication is currently disabled",
"Two-factor_authentication_native_mobile_app_warning" : "WARNING: Once you enable this, you will not be able to login on the native mobile apps (Rocket.Chat+) using your password until they implement the 2FA.",
"Thursday": "Thursday",
"Time_in_seconds": "Time in seconds",
"Title": "Title",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment