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

Translation: Add es-mx dialect translation #728

Closed
wants to merge 4 commits into from

Conversation

javier-squid
Copy link
Contributor

@javier-squid javier-squid commented Sep 18, 2020

es-mx.po translation file

@squid-prbot
Copy link
Collaborator

Can one of the admins verify this patch?

@yadij yadij changed the title es-mx.po translation file Translation: Add es-mx dialect translation Sep 18, 2020
@yadij
Copy link
Contributor

yadij commented Sep 18, 2020

OK to test

Copy link
Contributor

@yadij yadij left a comment

Choose a reason for hiding this comment

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

File contents look okay now. You will need to update the errors/aliases file entry to prevent directory and symlink collision on binary install.

@yadij yadij added the M-cleared-for-merge https://github.com/measurement-factory/anubis#pull-request-labels label Oct 14, 2020
Copy link
Contributor

@yadij yadij left a comment

Choose a reason for hiding this comment

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

Approving now under 10-day criteria. Will do the integration parts myself as a followup PR shortly.

squid-anubis pushed a commit that referenced this pull request Oct 16, 2020
@squid-anubis squid-anubis added M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels M-failed-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels and removed M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels labels Oct 16, 2020
@yadij yadij removed the M-failed-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels label Oct 17, 2020
squid-anubis pushed a commit that referenced this pull request Oct 17, 2020
@squid-anubis squid-anubis added the M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels label Oct 17, 2020
@squid-anubis squid-anubis added M-merged https://github.com/measurement-factory/anubis#pull-request-labels and removed M-cleared-for-merge https://github.com/measurement-factory/anubis#pull-request-labels M-waiting-staging-checks https://github.com/measurement-factory/anubis#pull-request-labels labels Oct 17, 2020
squidadm pushed a commit to squidadm/squid that referenced this pull request Nov 6, 2020
yadij pushed a commit that referenced this pull request Nov 8, 2020
@moracca
Copy link

moracca commented Nov 1, 2022

@yadij you mentioned "You will need to update the errors/aliases file entry to prevent directory and symlink collision on binary install."

Do you know if this ever happened? We are getting failures when upgrading from 4.x to 5.x where it fails while renaming files in this directory. I finally tracked it down by running truss to determine that the files were being extracted to the old symlinked directory before the symlink directory gets replaced with a real folder, causing the following error during upgrade:

Installed packages to be UPGRADED:

	squid: 4.15 -> 5.6 [local]

Number of packages to be upgraded: 1

Proceed with this action? [y/N]: y

[1/1] Upgrading squid from 4.15 to 5.6...
===> Creating groups.
Using existing group 'squid'.
===> Creating users
Using existing user 'squid'.
===> Creating homedir(s)
===> Pre-installation configuration for squid-5.6
[1/1] Extracting squid-5.6: 100%

pkg: Fail to rename /usr/local/etc/squid/errors/es-mx/.pkgtemp.ERR_ACCESS_DENIED.Vb543SO8sSxC -> /usr/local/etc/squid/errors/es-mx/ERR_ACCESS_DENIED:No such file or directory

I was only able to work around this problem by deleting the symlink before trying pkg upgrade.

Could this fix be added to an upcoming release?

@moracca
Copy link

moracca commented Nov 1, 2022

On second thought, I DO see es-mx in the errors/aliases file (commit), so it looks like that part was done, but perhaps there is still an issue when upgrading from a version where it used to be symlinked but now has its own locale?

@yadij
Copy link
Contributor

yadij commented Nov 2, 2022

@moracca, ouch, the fix for this will have to be done by the package vendor - to ensure the old alias symlinks are updated/removed before the new package contents are installed. Our script does not do that in order to avoid removing admins custom symlinks.

@yadij
Copy link
Contributor

yadij commented Nov 2, 2022

UPDATE: actually no that was wrong. The symlinks are created by our automake. I think I can/should fix it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
M-merged https://github.com/measurement-factory/anubis#pull-request-labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants