Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the problem of resolving locale context by language parameter #6647

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

JohnNiang
Copy link
Member

What type of PR is this?

/kind bug
/area theme
/milestone 2.20.x

What this PR does / why we need it:

If we pass a query language while requesting index page, we will get the wrong header Content-Language. Please see the result below:

http https://www.halo.run/\?language\=zh-CN -p h

HTTP/1.1 200 OK
Content-Language: und
...

After fixing, we will get the right header Content-Language.

http http://localhost:8090/\?language\=zh-CN -p h

HTTP/1.1 200 OK
Content-Language: zh-CN
...

Does this PR introduce a user-facing change?

修复主题端区域和语言解析错误的问题

Signed-off-by: JohnNiang <johnniang@foxmail.com>
@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Sep 12, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.20.x milestone Sep 12, 2024
@f2c-ci-robot f2c-ci-robot bot requested a review from guqing September 12, 2024 09:00
@f2c-ci-robot f2c-ci-robot bot added the area/theme Issues or PRs related to the Theme Provider label Sep 12, 2024
@f2c-ci-robot f2c-ci-robot bot requested a review from wan92hen September 12, 2024 09:00
Copy link

Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Sep 12, 2024
Copy link

f2c-ci-robot bot commented Sep 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guqing

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2024
Copy link

codecov bot commented Sep 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.08%. Comparing base (6cd8dc8) to head (38b429a).
Report is 65 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6647      +/-   ##
============================================
- Coverage     58.18%   58.08%   -0.10%     
- Complexity     3774     3919     +145     
============================================
  Files           651      670      +19     
  Lines         22125    22977     +852     
  Branches       1538     1576      +38     
============================================
+ Hits          12873    13346     +473     
- Misses         8641     9014     +373     
- Partials        611      617       +6     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@f2c-ci-robot f2c-ci-robot bot merged commit 6a5e9c4 into halo-dev:main Sep 12, 2024
8 checks passed
@JohnNiang JohnNiang deleted the bug/theme-locale-resolver branch September 13, 2024 02:42
f2c-ci-robot bot pushed a commit that referenced this pull request Sep 13, 2024
#### What type of PR is this?

/kind improvement
/area theme
/milestone 2.20.x

#### What this PR does / why we need it:

This PR simplifies ThemeLocaleContextResolver by removing unused attributes. 

In another PR <#6647>, fixed locale resolution for query parameter `language`. This PR fixes locale resolution for cookie `language` as well.

Please see the results below:

```bash
http https://www.halo.run/ Cookie:language=zh-CN -p h

HTTP/1.1 200 OK
Content-Language: und
```

```bash
http http://localhost:8090 Cookie:language=zh-CN -p h

HTTP/1.1 200 OK
Content-Language: zh-CN
```

#### Does this PR introduce a user-facing change?

```release-note
None
```
@ruibaby ruibaby modified the milestones: 2.20.x, 2.20.0 LTS Sep 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/theme Issues or PRs related to the Theme Provider kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants