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

(Migrated from 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

(Migrated from 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

(Migrated from 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 (Migrated from github.com) 이 변경사항을 승인함 2019-08-22 18:51:53 +00:00

igalic (Migrated from github.com) left a comment

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 (Migrated from 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 (Migrated from 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 (Migrated from 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 (Migrated from 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 (Migrated from 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

로그인하여 이 대화에 참여하세요.

No reviewers

igalic

마일스톤 없음

프로젝트 없음

담당자 없음

참가자 2명

알림

마감일

기한이 올바르지 않거나 범위를 벗어났습니다. "yyyy-mm-dd"형식을 사용해주십시오.

마감일이 설정되지 않았습니다.

전제조건

전제조건이 설정되지 않았습니다.

Reference: Plume/Plume#648

행
열