Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 07:16:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

support additional placeholder in stock-string

Browse Source
This commit is contained in:
B. Petersen
2019-09-12 14:40:08 +02:00
committed by holger krekel
parent 6d1076e1f6
commit 34433c4962
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/stock.rs
View File

@@ -140,12 +140,14 @@ impl Context {
/// Return stock string, replacing placeholders with provided string. /// Return stock string, replacing placeholders with provided string.
/// ///
/// This replaces both the *first* `%1$s` **and** `%1$d` /// This replaces both the *first* `%1$s`, `%1$d` and `%1$@`
/// placeholders with the provided string. /// placeholders with the provided string.
/// (the `%1$@` variant is used on iOS, the other are used on Android and Desktop)
pub fn stock_string_repl_str(&self, id: StockMessage, insert: impl AsRef<str>) -> String { pub fn stock_string_repl_str(&self, id: StockMessage, insert: impl AsRef<str>) -> String {
self.stock_str(id) self.stock_str(id)
.replacen("%1$s", insert.as_ref(), 1) .replacen("%1$s", insert.as_ref(), 1)
.replacen("%1$d", insert.as_ref(), 1) .replacen("%1$d", insert.as_ref(), 1)
.replacen("%1$@", insert.as_ref(), 1)
} }
/// Return stock string, replacing placeholders with provided int. /// Return stock string, replacing placeholders with provided int.
@@ -158,9 +160,10 @@ impl Context {
/// Return stock string, replacing 2 placeholders with provided string. /// Return stock string, replacing 2 placeholders with provided string.
/// ///
/// This replaces both the *first* `%1$s` **and** `%1$d` /// This replaces both the *first* `%1$s`, `%1$d` and `%1$@`
/// placeholders with the string in `insert` and does the same for /// placeholders with the string in `insert` and does the same for
/// `%2$s` and `%2$d` for `insert2`. /// `%2$s`, `%2$d` and `%2$@` for `insert2`.
/// (the `%1$@` variant is used on iOS, the other are used on Android and Desktop)
fn stock_string_repl_str2( fn stock_string_repl_str2(
&self, &self,
id: StockMessage, id: StockMessage,
@@ -170,8 +173,10 @@ impl Context {
self.stock_str(id) self.stock_str(id)
.replacen("%1$s", insert.as_ref(), 1) .replacen("%1$s", insert.as_ref(), 1)
.replacen("%1$d", insert.as_ref(), 1) .replacen("%1$d", insert.as_ref(), 1)
.replacen("%1$@", insert.as_ref(), 1)
.replacen("%2$s", insert2.as_ref(), 1) .replacen("%2$s", insert2.as_ref(), 1)
.replacen("%2$d", insert2.as_ref(), 1) .replacen("%2$d", insert2.as_ref(), 1)
.replacen("%2$@", insert2.as_ref(), 1)
} }
/// Return some kind of stock message /// Return some kind of stock message