Fix issue #642, frontend not in english if the user language does not exist #648

trinity-1686a · 2019-08-22T18:13:22Z

requiem958 已留言

2019-08-22 18:13:22 +00:00

(已從 github.com 遷移)

Iterate over catalogs to find the english index and then use it instead of 0.

Fix [#642](https://github.com/Plume-org/Plume/issues/642) Iterate over catalogs to find the english index and then use it instead of 0.

👍 1 ❤️ 1

codecov[bot] 已留言

2019-08-22 18:33:20 +00:00

(已從 github.com 遷移)

Codecov Report

Merging #648 into master will increase coverage by 0.23%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #648      +/-   ##
==========================================
+ Coverage   35.11%   35.35%   +0.23%     
==========================================
  Files          68       68              
  Lines        7943     7915      -28     
  Branches     1889     1894       +5     
==========================================
+ Hits         2789     2798       +9     
+ Misses       4374     4341      -33     
+ Partials      780      776       -4

# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/648?src=pr&el=h1) Report > Merging [#648](https://codecov.io/gh/Plume-org/Plume/pull/648?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/28fb50438e53019d5bda97e3b2532e5831096c9e?src=pr&el=desc) will **increase** coverage by `0.23%`. > The diff coverage is `n/a`. ```diff @@ Coverage Diff @@ ## master #648 +/- ## ========================================== + Coverage 35.11% 35.35% +0.23% ========================================== Files 68 68 Lines 7943 7915 -28 Branches 1889 1894 +5 ========================================== + Hits 2789 2798 +9 + Misses 4374 4341 -33 + Partials 780 776 -4 ```

codecov[bot] 已留言

2019-08-22 18:33:27 +00:00

(已從 github.com 遷移)

Codecov Report

Merging #648 into master will increase coverage by 0.23%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #648      +/-   ##
==========================================
+ Coverage   35.11%   35.35%   +0.23%     
==========================================
  Files          68       68              
  Lines        7943     7915      -28     
  Branches     1889     1894       +5     
==========================================
+ Hits         2789     2798       +9     
+ Misses       4374     4341      -33     
+ Partials      780      776       -4

# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/648?src=pr&el=h1) Report > Merging [#648](https://codecov.io/gh/Plume-org/Plume/pull/648?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/28fb50438e53019d5bda97e3b2532e5831096c9e?src=pr&el=desc) will **increase** coverage by `0.23%`. > The diff coverage is `n/a`. ```diff @@ Coverage Diff @@ ## master #648 +/- ## ========================================== + Coverage 35.11% 35.35% +0.23% ========================================== Files 68 68 Lines 7943 7915 -28 Branches 1889 1894 +5 ========================================== + Hits 2789 2798 +9 + Misses 4374 4341 -33 + Partials 780 776 -4 ```

igalic (已從 github.com 遷移) 核可了這些變更 2019-08-22 18:51:53 +00:00

igalic (已從 github.com 遷移) 留下了回應

please ignore my rambling

plume-front/src/main.rs

					
				@ -47,2 +47,4 @@

				        let lang = js! { return navigator.language }.into_string().unwrap();

				        let lang = lang.splitn(2, '-').next().unwrap_or("en");

				        let english_position = catalogs

igalic (已從 github.com 遷移) 已留言

2019-08-22 18:42:54 +00:00

this should be either a (cached?) constant, or a (cached?) config value

plume-front/src/main.rs

					
				@ -49,0 +50,4 @@

				        let english_position = catalogs

				            .iter()

				            .position(|(language_code, _)| *language_code == "en")

				            .unwrap();

igalic (已從 github.com 遷移) 已留言

2019-08-22 18:50:06 +00:00

while i understand that this is a simple operation, i don't think we need to do it every time

igalic (已從 github.com 遷移) 已留言

2019-08-22 18:51:35 +00:00

actually, never mind, this is an operation that's only dealing with things known at compile time

the optimiser will probably inline this as a constant literal

actually, never mind, this is an operation that's only dealing with things known at compile time the optimiser will probably inline this as a constant literal

requiem958 (已從 github.com 遷移) 已審核 2019-08-22 19:10:01 +00:00

plume-front/src/main.rs

					
				@ -47,2 +47,4 @@

				        let lang = js! { return navigator.language }.into_string().unwrap();

				        let lang = lang.splitn(2, '-').next().unwrap_or("en");

				        let english_position = catalogs

requiem958 (已從 github.com 遷移) 已留言

2019-08-22 19:10:01 +00:00

It should be a constant yes, but the rust doc of constant says :

Constants can be set only to a constant expression and not to the result of a function call or any other value that will be computed at runtime.

So i thought the keyword const was forbidden in this case.

It should be a constant yes, but the rust doc of constant says : > Constants can be set only to a constant expression and not to the result of a function call or any other value that will be computed at runtime. So i thought the keyword const was forbidden in this case.

trinity-1686a 已審核 2019-08-22 19:34:29 +00:00

plume-front/src/main.rs

					
				@ -47,2 +47,4 @@

				        let lang = js! { return navigator.language }.into_string().unwrap();

				        let lang = lang.splitn(2, '-').next().unwrap_or("en");

				        let english_position = catalogs

trinity-1686a 已留言

2019-08-22 19:34:29 +00:00

所有者

All this is in a lazy_static! call, so the result will be evaluated only one time, the first time CATALOG is accessed. The only thing it's not is cached between two different page loading, but that's not necessary imo

登入才能加入這對話。

沒有審核者

igalic

沒有里程碑

未選擇專案

沒有負責人

2 位參與者

通知

截止日期

截止日期無效或超出範圍，請使用「yyyy-mm-dd」的格式。

未設定截止日期。

先決條件

未設定先決條件。

參考: Plume/Plume#648

列
欄