paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Convert translate_emoticons message to FormatJS.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-04-12 21:02:45 -07:00
committed by Tim Abbott
parent 9985ce077b
commit 7974007fa6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
static/js/settings.js
View File

@@ -1,3 +1,4 @@
import Handlebars from "handlebars/runtime";
import $ from "jquery"; import $ from "jquery";
import timezones from "../generated/timezones.json"; import timezones from "../generated/timezones.json";
@@ -5,7 +6,7 @@ import render_settings_tab from "../templates/settings_tab.hbs";
import * as admin from "./admin"; import * as admin from "./admin";
import * as blueslip from "./blueslip"; import * as blueslip from "./blueslip";
import {i18n} from "./i18n"; import {$t_html, i18n} from "./i18n";
import * as overlays from "./overlays"; import * as overlays from "./overlays";
import {page_params} from "./page_params"; import {page_params} from "./page_params";
import * as people from "./people"; import * as people from "./people";
@@ -66,8 +67,10 @@ function setup_settings_label() {
left_side_userlist: i18n.t("Show user list on left sidebar in narrow windows"), left_side_userlist: i18n.t("Show user list on left sidebar in narrow windows"),
starred_message_counts: i18n.t("Show counts for starred messages"), starred_message_counts: i18n.t("Show counts for starred messages"),
twenty_four_hour_time: i18n.t("Time format"), twenty_four_hour_time: i18n.t("Time format"),
translate_emoticons: i18n.t( translate_emoticons: new Handlebars.SafeString(
"Convert emoticons before sending (<code>:)</code> becomes 😃)", $t_html({
defaultMessage: "Convert emoticons before sending (<code>:)</code> becomes 😃)",
}),
), ),
}; };
} }

2
static/templates/settings/settings_checkbox.hbs
View File

@@ -6,7 +6,7 @@
<span></span> <span></span>
</label> </label>
<label for="{{prefix}}{{setting_name}}" class="inline-block" id="{{prefix}}{{setting_name}}_label"> <label for="{{prefix}}{{setting_name}}" class="inline-block" id="{{prefix}}{{setting_name}}_label">
{{{label}}} {{label}}
{{#if help_link}} {{#if help_link}}
{{> ../help_link_widget link=help_link }} {{> ../help_link_widget link=help_link }}
{{/if}} {{/if}}