mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-01-03 14:00:32 +00:00
Code Issues Releases Wiki Activity

fix: improve track name localization

Browse Source
This commit is contained in:
ThetaDev 2023-03-19 21:20:21 +01:00
parent ef0a4cf8b2
commit 9b8ffdd2aa
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import android.text.TextUtils;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.PluralsRes; import androidx.annotation.PluralsRes;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.core.math.MathUtils; import androidx.core.math.MathUtils;
@ -22,6 +23,7 @@ import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.ListExtractor; import org.schabi.newpipe.extractor.ListExtractor;
import org.schabi.newpipe.extractor.localization.ContentCountry; import org.schabi.newpipe.extractor.localization.ContentCountry;
import org.schabi.newpipe.extractor.stream.AudioStream; import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.AudioTrackType;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@ -274,33 +276,35 @@ public final class Localization {
* @return localized track name * @return localized track name
*/ */
public static String audioTrackName(final Context context, final AudioStream track) { public static String audioTrackName(final Context context, final AudioStream track) {
String res; final String name;
if (track.getAudioLocale() != null) { if (track.getAudioLocale() != null) {
res = track.getAudioLocale().getDisplayLanguage(getAppLocale(context)); name = track.getAudioLocale().getDisplayLanguage(getAppLocale(context));
} else if (track.getAudioTrackName() != null) { } else if (track.getAudioTrackName() != null) {
res = track.getAudioTrackName(); name = track.getAudioTrackName();
} else { } else {
res = context.getString(R.string.unknown_audio_track); name = context.getString(R.string.unknown_audio_track);
} }
if (track.getAudioTrackType() != null) { if (track.getAudioTrackType() != null) {
res += " ("; final String trackType = audioTrackType(context, track.getAudioTrackType());
switch (track.getAudioTrackType()) { if (trackType != null) {
case ORIGINAL: return context.getString(R.string.audio_track_name, name, trackType);
res += context.getString(R.string.track_type_original);
break;
case DUBBED:
res += context.getString(R.string.track_type_dubbed);
break;
case DESCRIPTIVE:
res += context.getString(R.string.track_type_descriptive);
break;
} }
res += ")";
} }
return name;
}
return res; @Nullable
private static String audioTrackType(final Context context, final AudioTrackType trackType) {
switch (trackType) {
case ORIGINAL:
return context.getString(R.string.audio_track_type_original);
case DUBBED:
return context.getString(R.string.audio_track_type_dubbed);
case DESCRIPTIVE:
return context.getString(R.string.audio_track_type_descriptive);
}
return null;
} }
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////

7
app/src/main/res/values/strings.xml
View File

@ -778,7 +778,8 @@
<string name="feed_show_partially_watched">Partially watched</string> <string name="feed_show_partially_watched">Partially watched</string>
<string name="feed_show_upcoming">Upcoming</string> <string name="feed_show_upcoming">Upcoming</string>
<string name="sort">Sort</string> <string name="sort">Sort</string>
<string name="track_type_original">original</string> <string name="audio_track_name">%s %s</string>
<string name="track_type_dubbed">dubbed</string> <string name="audio_track_type_original">original</string>
<string name="track_type_descriptive">descriptive</string> <string name="audio_track_type_dubbed">dubbed</string>
<string name="audio_track_type_descriptive">descriptive</string>
</resources> </resources>