From ee30b4c3f16d5d456c399af1614f39373f0b4502 Mon Sep 17 00:00:00 2001 From: Matjaz Horvat Date: Mon, 2 Aug 2021 16:44:25 +0000 Subject: [PATCH] Bug 1711028: Update the "accented" pseudo l10n strategy with markers. r=dminor,flod The updated strategy wraps parts of strings in square brackets, and hence "marks" the beginning and the end of the part of the string. Differential Revision: https://phabricator.services.mozilla.com/D121078 --- Cargo.lock | 8 +- intl/l10n/docs/fluent/tutorial.rst | 8 +- intl/l10n/rust/fluent-ffi/Cargo.toml | 4 +- intl/l10n/rust/fluent-ffi/src/bundle.rs | 4 +- intl/l10n/rust/l10nregistry-ffi/Cargo.toml | 2 +- intl/l10n/test/test_pseudo.js | 10 +- .../rust/fluent-pseudo/.cargo-checksum.json | 2 +- third_party/rust/fluent-pseudo/Cargo.toml | 4 +- third_party/rust/fluent-pseudo/LICENSE-APACHE | 201 ++++++++++++++++++ third_party/rust/fluent-pseudo/LICENSE-MIT | 19 ++ third_party/rust/fluent-pseudo/README.md | 10 +- third_party/rust/fluent-pseudo/src/lib.rs | 21 +- third_party/rust/fluent/.cargo-checksum.json | 2 +- third_party/rust/fluent/Cargo.toml | 4 +- toolkit/library/rust/shared/Cargo.toml | 2 +- 15 files changed, 266 insertions(+), 35 deletions(-) create mode 100644 third_party/rust/fluent-pseudo/LICENSE-APACHE create mode 100644 third_party/rust/fluent-pseudo/LICENSE-MIT diff --git a/Cargo.lock b/Cargo.lock index 4bb4515e4fa2..3926867db034 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1457,9 +1457,9 @@ dependencies = [ [[package]] name = "fluent" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" dependencies = [ "fluent-bundle", "fluent-pseudo", @@ -1537,9 +1537,9 @@ dependencies = [ [[package]] name = "fluent-pseudo" -version = "0.2.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f028d6802c52903b3d8fa1cc37264ae5b8b630161e600eccfa68d4ee6ce5163a" +checksum = "fded62f95114baa010b4fcd54aedc7b0762059cf6dfb0097f5b5c95fb56ed42f" dependencies = [ "regex", ] diff --git a/intl/l10n/docs/fluent/tutorial.rst b/intl/l10n/docs/fluent/tutorial.rst index f186226f51cb..6114b0e65d32 100644 --- a/intl/l10n/docs/fluent/tutorial.rst +++ b/intl/l10n/docs/fluent/tutorial.rst @@ -616,7 +616,8 @@ The three classes of potential problems that this can help with are: Many languages use longer strings than English. For example, German strings may be 30% longer (or more). Turning on pseudolocalization is a quick way to - test how the layout handles such locales. + test how the layout handles such locales. Strings that don't fit the space + available are truncated and pseudolocalization can also help with detecting them. - Bidi adaptation. @@ -627,10 +628,11 @@ The three classes of potential problems that this can help with are: To turn on pseudolocalization, add a new string pref :js:`intl.l10n.pseudo` and select the strategy to be used: - - :js:`accented` - Ȧȧƈƈḗḗƞŧḗḗḓ Ḗḗƞɠŀīīşħ + - :js:`accented` - [Ȧȧƈƈḗḗƞŧḗḗḓ Ḗḗƞɠŀīīşħ] This strategy replaces all Latin characters with their accented equivalents, - and duplicates some vowels to create roughly 30% longer strings. + and duplicates some vowels to create roughly 30% longer strings. Strings are + wrapped in markers (square brackets), which help with detecting truncation. - :js:`bidi` - ɥsıʅƃuƎ ıpıԐ diff --git a/intl/l10n/rust/fluent-ffi/Cargo.toml b/intl/l10n/rust/fluent-ffi/Cargo.toml index bd627d63ee9c..864f8d71e0e5 100644 --- a/intl/l10n/rust/fluent-ffi/Cargo.toml +++ b/intl/l10n/rust/fluent-ffi/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Zibi Braniecki "] edition = "2018" [dependencies] -fluent = { version = "0.15", features = ["fluent-pseudo"] } -fluent-pseudo = "0.2.3" +fluent = { version = "0.16", features = ["fluent-pseudo"] } +fluent-pseudo = "0.3.1" intl-memoizer = "0.5" unic-langid = "0.9" nsstring = { path = "../../../../xpcom/rust/nsstring" } diff --git a/intl/l10n/rust/fluent-ffi/src/bundle.rs b/intl/l10n/rust/fluent-ffi/src/bundle.rs index c49e0ab8f735..a8b282688fd7 100644 --- a/intl/l10n/rust/fluent-ffi/src/bundle.rs +++ b/intl/l10n/rust/fluent-ffi/src/bundle.rs @@ -26,11 +26,11 @@ pub enum FluentArgument { } fn transform_accented(s: &str) -> Cow { - transform_dom(s, false, true) + transform_dom(s, false, true, true) } fn transform_bidi(s: &str) -> Cow { - transform_dom(s, false, false) + transform_dom(s, false, false, false) } fn format_numbers(num: &FluentValue, intls: &IntlLangMemoizer) -> Option { diff --git a/intl/l10n/rust/l10nregistry-ffi/Cargo.toml b/intl/l10n/rust/l10nregistry-ffi/Cargo.toml index 8fdf60e17c8b..776f6226aabf 100644 --- a/intl/l10n/rust/l10nregistry-ffi/Cargo.toml +++ b/intl/l10n/rust/l10nregistry-ffi/Cargo.toml @@ -13,7 +13,7 @@ log = "0.4" nserror = { path = "../../../../xpcom/rust/nserror" } nsstring = { path = "../../../../xpcom/rust/nsstring" } l10nregistry = { git = "https://github.com/zbraniecki/l10nregistry-rs", rev = "92d8fbfbbbdffa2047ce01a935a389eb11031f69" } -fluent = { version = "0.15.0", features = ["fluent-pseudo"] } +fluent = { version = "0.16", features = ["fluent-pseudo"] } unic-langid = "0.9" thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } async-trait = "0.1" diff --git a/intl/l10n/test/test_pseudo.js b/intl/l10n/test/test_pseudo.js index 00fa8fa670ce..74bf579ff31c 100644 --- a/intl/l10n/test/test_pseudo.js +++ b/intl/l10n/test/test_pseudo.js @@ -29,15 +29,15 @@ function getAttributeByName(attributes, name) { } /** - * This test verifies that as we switching between - * different pseudo strategies the Localization object + * This test verifies that as we switch between + * different pseudo strategies, the Localization object * follows and formats using the given strategy. * * We test values and attributes and make sure that * a single-character attributes, commonly used for access keys * don't get transformed. */ -add_task(async function test_accented_works() { +add_task(async function test_pseudo_works() { Services.prefs.setStringPref("intl.l10n.pseudo", ""); let generateBundles = addMockFileSource(); @@ -64,9 +64,9 @@ add_task(async function test_accented_works() { Services.prefs.setStringPref("intl.l10n.pseudo", "accented"); let message = (await l10n.formatMessages([{id: "key"}]))[0]; - ok(message.value.includes("Ŧħiş iş aa şiƞɠŀee ḿeeşşaaɠee")); + ok(message.value.includes("[Ŧħiş iş aa şiƞɠŀee ḿeeşşaaɠee]")); let attr0 = getAttributeByName(message.attributes, "tooltip"); - ok(attr0.value.includes("Ŧħiş iş aa ŧooooŀŧiƥ")); + ok(attr0.value.includes("[Ŧħiş iş aa ŧooooŀŧiƥ]")); let attr1 = getAttributeByName(message.attributes, "accesskey"); equal(attr1.value, "f"); } diff --git a/third_party/rust/fluent-pseudo/.cargo-checksum.json b/third_party/rust/fluent-pseudo/.cargo-checksum.json index 15d876288461..58022a761173 100644 --- a/third_party/rust/fluent-pseudo/.cargo-checksum.json +++ b/third_party/rust/fluent-pseudo/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"e8314d0278f83d921d2cf1777ddda0ea476621e6b217c60fef018d6555819553","README.md":"c724fbe817e1370765c91bd14e35486ff43a58214598202eafe70fd35f3a785d","src/lib.rs":"ae1cb5330baa8d6a875d834c614d7f42f8ab57dbcf5f2baf2276c90eb671c4f2"},"package":"f028d6802c52903b3d8fa1cc37264ae5b8b630161e600eccfa68d4ee6ce5163a"} \ No newline at end of file +{"files":{"Cargo.toml":"3490fcbcbf99a8488b8cf276fe21f248e32084cf607afd418b5d99c6f558fb24","LICENSE-APACHE":"5db2b182453ff32ed40f7da63589c9667a3f8bd8b16b1471b152caae56f77e45","LICENSE-MIT":"49c0b000c03731d9e3970dc059ad4ca345d773681f4a612b0024435b663e0220","README.md":"f1b5a3664d893f6779fe7573cc34e8ab38e4ef9f2d4e19019d7aa46b3e4d91b5","src/lib.rs":"6ae0a9b042f5627d69f91d21dbd8845bf11cc66528065a7ba93fc982cf8bfa17"},"package":"fded62f95114baa010b4fcd54aedc7b0762059cf6dfb0097f5b5c95fb56ed42f"} \ No newline at end of file diff --git a/third_party/rust/fluent-pseudo/Cargo.toml b/third_party/rust/fluent-pseudo/Cargo.toml index e6094899da5b..5abfc069a124 100644 --- a/third_party/rust/fluent-pseudo/Cargo.toml +++ b/third_party/rust/fluent-pseudo/Cargo.toml @@ -13,9 +13,9 @@ [package] edition = "2018" name = "fluent-pseudo" -version = "0.2.3" +version = "0.3.1" authors = ["Zibi Braniecki ", "Staś Małolepszy "] -include = ["src/**/*", "benches/*.rs", "Cargo.toml", "README.md"] +include = ["src/**/*", "benches/*.rs", "Cargo.toml", "README.md", "LICENSE-APACHE", "LICENSE-MIT"] description = "Pseudolocalization transformation API for use with Project Fluent API.\n" homepage = "http://www.projectfluent.org" readme = "README.md" diff --git a/third_party/rust/fluent-pseudo/LICENSE-APACHE b/third_party/rust/fluent-pseudo/LICENSE-APACHE new file mode 100644 index 000000000000..35582f166b4b --- /dev/null +++ b/third_party/rust/fluent-pseudo/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2017 Mozilla + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/third_party/rust/fluent-pseudo/LICENSE-MIT b/third_party/rust/fluent-pseudo/LICENSE-MIT new file mode 100644 index 000000000000..5655fa311cd2 --- /dev/null +++ b/third_party/rust/fluent-pseudo/LICENSE-MIT @@ -0,0 +1,19 @@ +Copyright 2017 Mozilla + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/third_party/rust/fluent-pseudo/README.md b/third_party/rust/fluent-pseudo/README.md index 0507f0780c74..152ed4df5336 100644 --- a/third_party/rust/fluent-pseudo/README.md +++ b/third_party/rust/fluent-pseudo/README.md @@ -1,11 +1,11 @@ # Fluent -`fluent-pseudo` is a Rust implementation of the pseudolocalization API for [Project Fluent][], a localization +`fluent-pseudo` is a Rust implementation of the pseudolocalization API for [Project Fluent](https://projectfluent.org/), a localization framework designed to unleash the entire expressive power of natural language translations. -[![crates.io](http://meritbadge.herokuapp.com/fluent-pseudo)](https://crates.io/crates/fluent-pseudo) -[![Build Status](https://travis-ci.org/projectfluent/fluent-rs.svg?branch=master)](https://travis-ci.org/projectfluent/fluent-rs) +[![crates.io](https://meritbadge.herokuapp.com/fluent-pseudo)](https://crates.io/crates/fluent-pseudo) +[![Build and test](https://github.com/projectfluent/fluent-rs/workflows/Build%20and%20test/badge.svg)](https://github.com/projectfluent/fluent-rs/actions?query=branch%3Amaster+workflow%3A%22Build+and+test%22) [![Coverage Status](https://coveralls.io/repos/github/projectfluent/fluent-rs/badge.svg?branch=master)](https://coveralls.io/github/projectfluent/fluent-rs?branch=master) Usage @@ -18,7 +18,7 @@ use fluent_pseudo::transform; fn transform_wrapper(s: &str) -> Cow { // Not flipped and elongated pseudolocalization. - transform(s, false, true) + transform(s, false, true, false) } @@ -28,7 +28,7 @@ fn main() { .expect("Could not parse an FTL string."); let langid_en = langid!("en"); - let mut bundle = FluentBundle::new(&[langid_en]); + let mut bundle = FluentBundle::new(vec![langid_en]); // Set pseudolocalization bundle.set_transform(Some(transform_wrapper)); diff --git a/third_party/rust/fluent-pseudo/src/lib.rs b/third_party/rust/fluent-pseudo/src/lib.rs index fb899afab7fa..607b91eaefc5 100644 --- a/third_party/rust/fluent-pseudo/src/lib.rs +++ b/third_party/rust/fluent-pseudo/src/lib.rs @@ -23,7 +23,7 @@ static FLIPPED_CAPS_MAP: &[char] = &[ static mut RE_EXCLUDED: Option = None; static mut RE_AZ: Option = None; -pub fn transform_dom(s: &str, flipped: bool, elongate: bool) -> Cow { +pub fn transform_dom(s: &str, flipped: bool, elongate: bool, with_markers: bool) -> Cow { // Exclude access-keys and other single-char messages if s.len() == 1 { return s.into(); @@ -56,6 +56,11 @@ pub fn transform_dom(s: &str, flipped: bool, elongate: bool) -> Cow { let result_range = pos + diff..result.len(); let transform_sub = transform(&s[range], flipped, elongate); result.to_mut().replace_range(result_range, &transform_sub); + + if with_markers { + return Cow::from("[") + result + "]" + } + result } @@ -71,7 +76,7 @@ pub fn transform(s: &str, flipped: bool, elongate: bool) -> Cow { re_az.replace_all(s, |caps: &Captures| { let ch = caps[0].chars().next().unwrap(); let cc = ch as u8; - if cc >= 97 && cc <= 122 { + if (97..=122).contains(&cc) { let pos = cc - 97; let new_char = small_map[pos as usize]; // duplicate "a", "e", "o" and "u" to emulate ~30% longer text @@ -82,7 +87,7 @@ pub fn transform(s: &str, flipped: bool, elongate: bool) -> Cow { } else { new_char.to_string() } - } else if cc >= 65 && cc <= 90 { + } else if (65..=90).contains(&cc) { let pos = cc - 65; let new_char = caps_map[pos as usize]; new_char.to_string() @@ -113,14 +118,18 @@ mod tests { #[test] fn dom_test() { - let x = transform_dom("Hello World", false, true); + let x = transform_dom("Hello World", false, true, false); assert_eq!(x, "Ħeeŀŀoo Ẇoořŀḓ"); - let x = transform_dom("Hello World in my House.", false, true); + let x = transform_dom("Hello World in my House.", false, true, false); assert_eq!(x, "Ħeeŀŀoo Ẇoořŀḓ iƞ ḿẏ Ħoouuşee."); + // Use markers. + let x = transform_dom("Hello World within markers", false, false, true); + assert_eq!(x, "[Ħeŀŀo Ẇořŀḓ ẇiŧħiƞ ḿařķeřş]"); + // Don't touch single character values. - let x = transform_dom("f", false, true); + let x = transform_dom("f", false, true, false); assert_eq!(x, "f"); } } diff --git a/third_party/rust/fluent/.cargo-checksum.json b/third_party/rust/fluent/.cargo-checksum.json index 3a9c8bc66aec..1cb95d6e9bd6 100644 --- a/third_party/rust/fluent/.cargo-checksum.json +++ b/third_party/rust/fluent/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"4d649a187c5dc48bcc92d551d34f6b3d3ab7972fb31beaa9272a1bce52b71518","LICENSE-APACHE":"5db2b182453ff32ed40f7da63589c9667a3f8bd8b16b1471b152caae56f77e45","LICENSE-MIT":"49c0b000c03731d9e3970dc059ad4ca345d773681f4a612b0024435b663e0220","README.md":"8b0515e111582a328d3f958af49c2bce55d70df0016edc50fe296e8dd318de32","src/lib.rs":"a64593add0850e6038cf63e1b805ea993835a7d822f5666422a2b8d22af9daa6"},"package":"bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a"} \ No newline at end of file +{"files":{"Cargo.toml":"90672342000bb7f84bee3d9517ddf6d3f32f8e4b4fd38271c67855112456db05","LICENSE-APACHE":"5db2b182453ff32ed40f7da63589c9667a3f8bd8b16b1471b152caae56f77e45","LICENSE-MIT":"49c0b000c03731d9e3970dc059ad4ca345d773681f4a612b0024435b663e0220","README.md":"8b0515e111582a328d3f958af49c2bce55d70df0016edc50fe296e8dd318de32","src/lib.rs":"a64593add0850e6038cf63e1b805ea993835a7d822f5666422a2b8d22af9daa6"},"package":"61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7"} \ No newline at end of file diff --git a/third_party/rust/fluent/Cargo.toml b/third_party/rust/fluent/Cargo.toml index ff1d265e17a7..016f04bf4c7d 100644 --- a/third_party/rust/fluent/Cargo.toml +++ b/third_party/rust/fluent/Cargo.toml @@ -13,7 +13,7 @@ [package] edition = "2018" name = "fluent" -version = "0.15.0" +version = "0.16.0" authors = ["Zibi Braniecki ", "Staś Małolepszy "] include = ["src/**/*", "benches/*.rs", "Cargo.toml", "README.md", "LICENSE-APACHE", "LICENSE-MIT"] description = "A localization system designed to unleash the entire expressive power of\nnatural language translations.\n" @@ -27,7 +27,7 @@ repository = "https://github.com/projectfluent/fluent-rs" version = "0.15" [dependencies.fluent-pseudo] -version = "0.2" +version = "0.3" optional = true [dependencies.unic-langid] diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml index 16fc5de09368..337baa6e4253 100644 --- a/toolkit/library/rust/shared/Cargo.toml +++ b/toolkit/library/rust/shared/Cargo.toml @@ -62,7 +62,7 @@ gecko-profiler = { path = "../../../../tools/profiler/rust-api"} # changing this version. rusqlite = { version = "0.24.1", features = ["modern_sqlite", "in_gecko"] } -fluent = { version = "0.15", features = ["fluent-pseudo"] } +fluent = { version = "0.16", features = ["fluent-pseudo"] } fluent-ffi = { path = "../../../../intl/l10n/rust/fluent-ffi" } l10nregistry-ffi = { path = "../../../../intl/l10n/rust/l10nregistry-ffi" } l10nregistry = { git = "https://github.com/zbraniecki/l10nregistry-rs", rev = "92d8fbfbbbdffa2047ce01a935a389eb11031f69" }