Skip to content

fix(locale): rename city_prefix to city_name for en_NG, en_ZA, en_AU_ocker#2111

Merged
ST-DDT merged 4 commits intofaker-js:nextfrom
matthewmayer:fix/en-city-name-locales
May 1, 2023
Merged

fix(locale): rename city_prefix to city_name for en_NG, en_ZA, en_AU_ocker#2111
ST-DDT merged 4 commits intofaker-js:nextfrom
matthewmayer:fix/en-city-name-locales

Conversation

@matthewmayer
Copy link
Copy Markdown
Contributor

similar to #2109 for en_* locales

@matthewmayer matthewmayer requested a review from a team as a code owner April 30, 2023 05:26
@matthewmayer matthewmayer self-assigned this Apr 30, 2023
@matthewmayer matthewmayer added m: location Something is referring to the location module c: locale Permutes locale definitions p: 1-normal Nothing urgent labels Apr 30, 2023
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 30, 2023

Codecov Report

Merging #2111 (f5eab34) into next (ec1ca12) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##             next    #2111      +/-   ##
==========================================
- Coverage   99.59%   99.59%   -0.01%     
==========================================
  Files        2567     2567              
  Lines      243394   243394              
  Branches     1254     1251       -3     
==========================================
- Hits       242420   242412       -8     
- Misses        947      955       +8     
  Partials       27       27              
Impacted Files Coverage Δ
src/locales/en_AU_ocker/location/city_name.ts 100.00% <ø> (ø)
src/locales/en_NG/location/city_name.ts 100.00% <ø> (ø)
src/locales/en_ZA/location/city_name.ts 100.00% <ø> (ø)
src/locales/en_AU_ocker/location/city_pattern.ts 100.00% <100.00%> (ø)
src/locales/en_AU_ocker/location/index.ts 100.00% <100.00%> (ø)
src/locales/en_NG/location/city_pattern.ts 100.00% <100.00%> (ø)
src/locales/en_NG/location/index.ts 100.00% <100.00%> (ø)
src/locales/en_ZA/location/city_pattern.ts 100.00% <100.00%> (ø)
src/locales/en_ZA/location/index.ts 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

ST-DDT
ST-DDT previously approved these changes Apr 30, 2023
@ST-DDT ST-DDT requested review from a team April 30, 2023 06:17
@ST-DDT ST-DDT added the s: accepted Accepted feature / Confirmed bug label Apr 30, 2023
@ST-DDT ST-DDT requested a review from a team April 30, 2023 11:29
ejcheng
ejcheng previously approved these changes Apr 30, 2023
@ST-DDT
Copy link
Copy Markdown
Member

ST-DDT commented May 1, 2023

Could you please resolve the conflicts by running the generate locales script again. Sorry for the inconvinience.

@ST-DDT ST-DDT added the needs rebase There is a merge conflict label May 1, 2023
# Conflicts:
#	src/locales/en_NG/location/index.ts
#	src/locales/en_ZA/location/index.ts
@matthewmayer matthewmayer dismissed stale reviews from ejcheng, xDivisionByZerox, and ST-DDT via f5eab34 May 1, 2023 09:44
@matthewmayer matthewmayer removed the needs rebase There is a merge conflict label May 1, 2023
@ST-DDT ST-DDT requested review from a team, ejcheng and xDivisionByZerox May 1, 2023 10:20
@ST-DDT ST-DDT merged commit a0fb69d into faker-js:next May 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c: locale Permutes locale definitions m: location Something is referring to the location module p: 1-normal Nothing urgent s: accepted Accepted feature / Confirmed bug

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants