Use product name on rich document, if available#3971
Merged
tobiasKaminsky merged 2 commits intomasterfrom May 23, 2019
Merged
Conversation
src/main/res/values/strings.xml
Outdated
| <string name="stream_not_possible_message">Please download media instead or use external app.</string> | ||
| <string name="folder_already_exists">Folder already exists</string> | ||
| <string name="actionbar_open_as_richdocument">Open with Collabora</string> | ||
| <string name="actionbar_open_as_richdocument">Open with</string> |
Member
There was a problem hiding this comment.
Or work with a pattern to have a parameter to not manually concatenate strings since we don't know how that works for all languages? :)
AndyScherzinger
requested changes
May 8, 2019
Member
AndyScherzinger
left a comment
AndyScherzinger
left a comment
There was a problem hiding this comment.
Please change the string to use a variable, probably better for translations :)
Else it looks fine to me.
Codecov Report
@@ Coverage Diff @@
## master #3971 +/- ##
===========================================
- Coverage 6.58% 6.53% -0.06%
Complexity 1 1
===========================================
Files 322 322
Lines 30908 30927 +19
Branches 4408 4411 +3
===========================================
- Hits 2036 2021 -15
- Misses 28576 28612 +36
+ Partials 296 294 -2
|
Codecov Report
@@ Coverage Diff @@
## master #3971 +/- ##
============================================
- Coverage 14.3% 14.29% -0.01%
Complexity 1 1
============================================
Files 329 329
Lines 30998 31017 +19
Branches 4424 4427 +3
============================================
Hits 4435 4435
- Misses 25779 25795 +16
- Partials 784 787 +3
|
AndyScherzinger
approved these changes
May 9, 2019
tobiasKaminsky
force-pushed
the
richDocumentsProductName
branch
from
a72a0c5 to
cd3f4fa
Compare
Member
Author
|
I'll rebase this after #3989 is merged, as both touch database. |
Member
|
@tobiasKaminsky #3989 has been merged |
tobiasKaminsky
force-pushed
the
richDocumentsProductName
branch
from
cd3f4fa to
a28937d
Compare
Member
|
Lint score increased |
tobiasKaminsky
force-pushed
the
richDocumentsProductName
branch
from
a28937d to
0e6a37d
Compare
Member
Author
This was due to the fact that I changed an existing translatable string and thus it is not yet updated on Transifex. |
AndyScherzinger
force-pushed
the
richDocumentsProductName
branch
from
0e6a37d to
5b1b608
Compare
tobiasKaminsky
force-pushed
the
richDocumentsProductName
branch
from
03435c1 to
54946a3
Compare
Member
|
@tobiasKaminsky can Rebase this one again? |
use placeholder for string reset to master-snapshot fix analysis warning use new translatable string use var vor qa flavor too Signed-off-by: tobiasKaminsky <tobias@kaminsky.me> Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
tobiasKaminsky
force-pushed
the
richDocumentsProductName
branch
from
54946a3 to
403a3e0
Compare
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Collaborator
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/9393.apk |
Collaborator
Codacy297Lint
SpotBugs (new)
SpotBugs (master)
|
tobiasKaminsky
added a commit
that referenced
this pull request
May 24, 2019
3b31841 Merge pull request #3969 from nextcloud/receivePushDelete 6074c93 Drone: update FindBugs results to reflect reduced error/warning count [skip ci] f28007e OCFileListFragment: Only scroll to top if directory changed (#4058) b061e4d Merge commit '51ee4d88fd0555a945a24b1ab3beba2ffdc79c06' 51ee4d8 handle silent delete/delete-all push notifications do not ignore talk messages (will only be sent if no talk app is installed) exclude generated Parcelable fb6b11f Use product name on rich document, if available (#3971) 4197d3b use proper qa build lib dependency 8c06097 Only compare directories if necessary 403a3e0 Use product name on rich document, if available use placeholder for string reset to master-snapshot fix analysis warning use new translatable string use var vor qa flavor too 9b0a789 Merge pull request #4040 from nextcloud/ezaquarii/remove-findbugs d6b4dee Remove legacy FindBugs tasks from build script 53c9c05 daily dev 20190523
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: tobiasKaminsky tobias@kaminsky.me