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

European Portuguese translation #11568

Merged
merged 9 commits into from
Jun 5, 2020
Merged

Conversation

emansije
Copy link
Contributor

This PR includes the modifications necessary to make use of the European Portuguese translation, hopefully still in time for the 1.12 release.

I'm not sure if there is a specific order in which the entries should be placed, so I chose to put it right after the Brazilian Portuguese. The exception is in the file config/config.yaml because of the weight parameter, since I didn't know the consequences of altering that order.

The reference for the European Portuguese was missing in LANGS and in NAMES.
Langs was missing an entry for the European Portuguese.
@lunny lunny closed this May 23, 2020
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 23, 2020
@lunny lunny reopened this May 23, 2020
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 24, 2020
@lafriks lafriks added this to the 1.13.0 milestone May 24, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 4, 2020
@zeripath
Copy link
Contributor

zeripath commented Jun 5, 2020

make lg-tm work

@zeripath zeripath merged commit a39557f into go-gitea:master Jun 5, 2020
@zeripath
Copy link
Contributor

zeripath commented Jun 5, 2020

please send backport

Simple commands below:

git checkout origin/release/v1.12 -b backport-11568
git cherry-pick a39557f
# Optional: git commit --amend  to add Backport #11568 as the first line of the long commit form
git push fork backport-11568

@emansije
Copy link
Contributor Author

emansije commented Jun 5, 2020

please send backport

Simple commands below:

git checkout origin/release/v1.12 -b backport-11568
git cherry-pick a39557f

When I submitted the cherry-pick command I got:

fatal: bad revision 'a39557f'

Any idea why?

@zeripath
Copy link
Contributor

zeripath commented Jun 5, 2020

Did you pull the latest changes before attempting the cherry pick?

emansije added a commit to emansije/gitea that referenced this pull request Jun 5, 2020
This PR includes the modifications necessary to make use of the European Portuguese translation from the default setting.
@emansije
Copy link
Contributor Author

emansije commented Jun 5, 2020

Oops! Sorry! I forgot to fetch upstream.

@techknowlogick techknowlogick added the backport/done All backports for this PR have been created label Jun 5, 2020
zeripath added a commit that referenced this pull request Jun 6, 2020
This PR includes the modifications necessary to make use of the European Portuguese translation from the default setting.

Co-authored-by: zeripath <art27@cantab.net>
@emansije emansije deleted the include_pt-pt branch July 22, 2020 16:24
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
This PR includes the modifications necessary to make use of the European Portuguese translation from the default setting.
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants