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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from May 1, 2023
Merged

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

merged 4 commits into from May 1, 2023

Commits on Apr 30, 2023

  1. fix(locale): rename city_prefix to city_name for en_NG, en_ZA, en_AU_… 

    …ocker

similar to faker-js#2109 for en_* locales
    @matthewmayer
    matthewmayer committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    fef05a5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'next' into fix/en-city-name-locales

    @ST-DDT
    ST-DDT committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    0f924dc View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. Merge branch 'next' into fix/en-city-name-locales 

    # Conflicts:
#	src/locales/en_NG/location/index.ts
#	src/locales/en_ZA/location/index.ts
    @matthewmayer
    matthewmayer committed May 1, 2023
    Configuration menu
    Copy the full SHA
    82781ed View commit details
    Browse the repository at this point in the history

  2. fix conflicts caused by aftermath of faker-js#2058

    @matthewmayer
    matthewmayer committed May 1, 2023
    Configuration menu
    Copy the full SHA
    f5eab34 View commit details
    Browse the repository at this point in the history