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

l10n: Spelling unification #26706

Merged
merged 1 commit into from
May 31, 2021
Merged

l10n: Spelling unification #26706

merged 1 commit into from
May 31, 2021

Conversation

Valdnet
Copy link
Contributor

@Valdnet Valdnet commented Apr 22, 2021

Spelling unification in Transifex.

Signed-off-by: Valdnet 47037905+Valdnet@users.noreply.github.com

@Valdnet
Copy link
Contributor Author

Valdnet commented May 19, 2021

@nickvergessen Can you approve and merge?

@nickvergessen
Copy link
Member 

1) OCA\User_LDAP\Tests\Settings\SectionTest::testGetName
Expectation failed for method name is "t" when invoked 1 time(s)
Parameter 0 for invocation OCP\IL10N::t('LDAP/AD integration', Array ()): string does not match expected value.
Failed asserting that two strings are equal.

--- Expected
+++ Actual
@@ @@
-'LDAP / AD integration'
+'LDAP/AD integration'

/drone/src/apps/user_ldap/lib/Settings/Section.php:64
/drone/src/apps/user_ldap/tests/Settings/SectionTest.php:64

tests are failing

@Valdnet
Copy link
Contributor Author

Valdnet commented May 19, 2021

@nickvergessen Can you merge now?

@blizzz
Copy link
Member

blizzz commented May 20, 2021

maybe we can squash the commits? 11 are a bit over the top:)

@Valdnet
Copy link
Contributor Author

Valdnet commented May 21, 2021

maybe we can squash the commits?

I am asking for squash. I cannot do it from the GitHub level.

@Valdnet @nickvergessen
l10n: Spelling unification
77ca79f 
Spelling unification in Transifex.

Signed-off-by: Valdnet 47037905+Valdnet@users.noreply.github.com
@nickvergessen nickvergessen added 4. to release Ready to be released and/or waiting for tests to finish feature: language l10n and translations labels May 21, 2021
@nickvergessen nickvergessen added this to the Nextcloud 22 milestone May 21, 2021
@nickvergessen
Copy link
Member

Done

@MorrisJobke MorrisJobke mentioned this pull request May 26, 2021
Merged
98 tasks
@Valdnet
Copy link
Contributor Author

Valdnet commented May 27, 2021

@nickvergessen Can you merge now?

@nickvergessen nickvergessen merged commit 7e8ddcd into master May 31, 2021
@nickvergessen nickvergessen deleted the Valdnet-patch-7 branch May 31, 2021 15:21
@blizzz blizzz mentioned this pull request Jun 2, 2021
Merged
57 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@rakekniven rakekniven rakekniven approved these changes

@blizzz blizzz blizzz approved these changes

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: language l10n and translations
Projects
None yet
Milestone
Nextcloud 22
Development

Successfully merging this pull request may close these issues.
4 participants
@Valdnet @nickvergessen @blizzz @rakekniven