Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4365 from B0pol/prettytime 

Update to PrettyTime 4.0.6
This commit is contained in:
Tobias Groza 2020-10-02 20:40:11 +02:00 committed by GitHub
parent 83ea91586b 2b1469e02e
commit ef8a1bcf47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -209,7 +209,7 @@ dependencies {
implementation "io.reactivex.rxjava2:rxandroid:2.1.1" implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
implementation "com.jakewharton.rxbinding2:rxbinding:2.2.0" implementation "com.jakewharton.rxbinding2:rxbinding:2.2.0"
implementation "org.ocpsoft.prettytime:prettytime:4.0.5.Final" implementation "org.ocpsoft.prettytime:prettytime:4.0.6.Final"
} }
static String getGitWorkingBranch() { static String getGitWorkingBranch() {

4
app/src/main/java/org/schabi/newpipe/util/Localization.java
View File

@ -305,9 +305,7 @@ public final class Localization {
} }
public static String relativeTime(final Calendar calendarTime) { public static String relativeTime(final Calendar calendarTime) {
final String time = getPrettyTime().formatUnrounded(calendarTime); return getPrettyTime().formatUnrounded(calendarTime);
return time.startsWith("-") ? time.substring(1) : time;
//workaround fix for russian showing -1 day ago, -19hrs ago…
} }
private static void changeAppLanguage(final Locale loc, final Resources res) { private static void changeAppLanguage(final Locale loc, final Resources res) {