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

App strings reworked #1106

Merged
merged 3 commits into from
Nov 1, 2021
Merged

App strings reworked #1106

merged 3 commits into from
Nov 1, 2021

Conversation

comradekingu
Copy link
Contributor

No description provided.

<string name="notification_backgroundOperations">Background operations</string>
<string name="notification_error">Error</string>
<string name="notification_incorrectCredentials">Incorrect credentials</string>
<string name="notification_incorrectCredentials">Wrong username or password</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Anything else possible here?

Copy link
Member

Choose a reason for hiding this comment

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

IIRC, incorrect client ID and client secret may cause that too. Maybe also things that cause HTTP 401 (like additional HTTP Basic auth), can't remember at the moment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If that happens to also be a thing to keep in mind, it can be added if it turns out to be a problem.

Copy link
Contributor

Choose a reason for hiding this comment

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

What about "Wrong login data" or "Wrong credentials"?

@di72nn di72nn added this to the 2.4.3 milestone Dec 7, 2020
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
@di72nn
Copy link
Member

di72nn commented Dec 8, 2020

Thank you for your work and sorry for the delayed in review.

@di72nn
Copy link
Member

di72nn commented Dec 8, 2020

Forgot to mention: most of these comments are subjective and I'd like to see somebody else to weigh in on this.

@wallabag wallabag deleted a comment from di72nn Dec 9, 2020
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
@Strubbl
Copy link
Contributor

Strubbl commented Mar 31, 2021

As far as i can see the changes requested by @tcitworld are resolved. It would be nice if you can approve the pull request.
Afterwards, if we resolve the remaining issues @di72nn had, we can merge this.

@Strubbl
Copy link
Contributor

Strubbl commented Jun 14, 2021

Hello @tcitworld and @di72nn , your both approvals on this PR are needed to get this merged. Otherwise merging is blocked

@di72nn di72nn removed this from the 2.4.3 milestone Jun 17, 2021
@di72nn di72nn mentioned this pull request Jun 17, 2021
@di72nn di72nn added this to the 2.4.4 milestone Jun 18, 2021
@di72nn
Copy link
Member

di72nn commented Sep 5, 2021

Squashed, rebased, improved (in my opinion) some stuff.
Also moved a couple of strings to a separate commit, because I couldn't decide what to do with them.

I guess I approve the PR in its current state, but I can't bring myself to re-read it again at the moment.

@comradekingu
Copy link
Contributor Author

@di72nn Good to go by me. I think it is more productive to give it another go sometime in the future, rather than getting too far down into diminishing returns :)

@Strubbl
Copy link
Contributor

Strubbl commented Nov 1, 2021

I guess I approve the PR in its current state

+1

I think it is more productive to give it another go sometime in the future, rather than getting too far down into diminishing returns :

sounds good to me.

when @tcitworld has another look over this issue, it can be merged. finally :)

@tcitworld
Copy link
Member

Needs a rebase

@tcitworld tcitworld merged commit f058996 into wallabag:master Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants