mirror of
https://github.com/antebudimir/tempus.git
synced 2025-12-31 09:33:33 +00:00
Change string translation with parameters
This commit is contained in:
CappielloAntonio
parent
33512eec2d
commit
3d4ec96a3a
6 changed files with 21 additions and 14 deletions
1
.idea/misc.xml
generated
1
.idea/misc.xml
generated
|
|
@ -49,6 +49,7 @@
|
|||
<entry key="app/src/main/res/layout/dialog_playlist_editor.xml" value="0.3229166666666667" />
|
||||
<entry key="app/src/main/res/layout/dialog_rating.xml" value="0.3229166666666667" />
|
||||
<entry key="app/src/main/res/layout/dialog_server_signup.xml" value="0.3229166666666667" />
|
||||
<entry key="app/src/main/res/layout/dialog_server_unreachable.xml" value="0.3229166666666667" />
|
||||
<entry key="app/src/main/res/layout/fragment_album_catalogue.xml" value="0.3229166666666667" />
|
||||
<entry key="app/src/main/res/layout/fragment_album_list_page.xml" value="0.225" />
|
||||
<entry key="app/src/main/res/layout/fragment_album_page.xml" value="0.2769409038238702" />
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHo
|
|||
Playlist playlist = playlists.get(position);
|
||||
|
||||
holder.textPlaylistName.setText(MusicUtil.getReadableString(playlist.getName()));
|
||||
holder.textPlaylistSongCount.setText(R.string.playlist_info_song_count + playlist.getSongCount());
|
||||
holder.textPlaylistSongCount.setText(context.getString(R.string.playlist_info_song_count, playlist.getSongCount()));
|
||||
|
||||
CustomGlideRequest.Builder
|
||||
.from(context, playlist.getPrimary(), CustomGlideRequest.PLAYLIST_PIC, null)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import java.util.List;
|
|||
public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHorizontalAdapter.ViewHolder> {
|
||||
private static final String TAG = "PlaylistHorizontalAdapter";
|
||||
|
||||
private final Context context;
|
||||
private final LayoutInflater mInflater;
|
||||
|
||||
private final PlaylistChooserViewModel playlistChooserViewModel;
|
||||
|
|
@ -29,6 +30,7 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
|
|||
private List<Playlist> playlists;
|
||||
|
||||
public PlaylistHorizontalAdapter(Context context, PlaylistChooserViewModel playlistChooserViewModel, PlaylistChooserDialog playlistChooserDialog) {
|
||||
this.context = context;
|
||||
this.mInflater = LayoutInflater.from(context);
|
||||
this.playlists = new ArrayList<>();
|
||||
|
||||
|
|
@ -48,7 +50,7 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
|
|||
Playlist playlist = playlists.get(position);
|
||||
|
||||
holder.playlistTitle.setText(MusicUtil.getReadableString(playlist.getName()));
|
||||
holder.playlistTrackCount.setText(playlist.getSongCount() + R.string.playlist_counted_tracks);
|
||||
holder.playlistTrackCount.setText(context.getString(R.string.playlist_counted_tracks, playlist.getSongCount()));
|
||||
holder.playlistDuration.setText(MusicUtil.getReadableDurationString(playlist.getDuration(), false));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@ public class PlaylistPageFragment extends Fragment {
|
|||
bind.animToolbar.setTitle(MusicUtil.getReadableString(playlistPageViewModel.getPlaylist().getName()));
|
||||
|
||||
bind.playlistNameLabel.setText(MusicUtil.getReadableString(playlistPageViewModel.getPlaylist().getName()));
|
||||
bind.playlistSongCountLabel.setText(getString(R.string.playlist_song_count) + playlistPageViewModel.getPlaylist().getSongCount());
|
||||
bind.playlistDurationLabel.setText(getString(R.string.playlist_duration) + MusicUtil.getReadableDurationString(playlistPageViewModel.getPlaylist().getDuration(), false));
|
||||
bind.playlistSongCountLabel.setText(getString(R.string.playlist_song_count, playlistPageViewModel.getPlaylist().getSongCount()));
|
||||
bind.playlistDurationLabel.setText(getString(R.string.playlist_duration, MusicUtil.getReadableDurationString(playlistPageViewModel.getPlaylist().getDuration(), false)));
|
||||
|
||||
if (playlistPageViewModel.isOffline()) {
|
||||
bind.playlistSongCountLabel.setVisibility(View.GONE);
|
||||
|
|
|
|||
|
|
@ -73,11 +73,11 @@ public class SongListPageFragment extends Fragment {
|
|||
} else if (requireArguments().getString(Song.BY_GENRE) != null) {
|
||||
songListPageViewModel.title = Song.BY_GENRE;
|
||||
songListPageViewModel.genre = requireArguments().getParcelable("genre_object");
|
||||
bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getName()) + getString(R.string.song_list_page_all));
|
||||
bind.pageTitleLabel.setText(getString(R.string.song_list_page_all, MusicUtil.getReadableString(songListPageViewModel.genre.getName())));
|
||||
} else if (requireArguments().getString(Song.BY_ARTIST) != null) {
|
||||
songListPageViewModel.title = Song.BY_ARTIST;
|
||||
songListPageViewModel.artist = requireArguments().getParcelable("artist_object");
|
||||
bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.artist.getName()) + getString(R.string.song_list_page_top));
|
||||
bind.pageTitleLabel.setText(getString(R.string.song_list_page_top, MusicUtil.getReadableString(songListPageViewModel.artist.getName())));
|
||||
} else if (requireArguments().getString(Song.BY_GENRES) != null) {
|
||||
songListPageViewModel.title = Song.BY_GENRES;
|
||||
songListPageViewModel.filters = requireArguments().getStringArrayList("filters_list");
|
||||
|
|
@ -86,7 +86,7 @@ public class SongListPageFragment extends Fragment {
|
|||
} else if (requireArguments().getString(Song.BY_YEAR) != null) {
|
||||
songListPageViewModel.title = Song.BY_YEAR;
|
||||
songListPageViewModel.year = requireArguments().getInt("year_object");
|
||||
bind.pageTitleLabel.setText(getString(R.string.song_list_page_year) + songListPageViewModel.year);
|
||||
bind.pageTitleLabel.setText(getString(R.string.song_list_page_year, songListPageViewModel.year));
|
||||
} else if (requireArguments().getString(Song.STARRED) != null) {
|
||||
songListPageViewModel.title = Song.STARRED;
|
||||
bind.pageTitleLabel.setText(R.string.song_list_page_starred);
|
||||
|
|
|
|||
|
|
@ -111,17 +111,17 @@
|
|||
<string name="playlist_chooser_dialog_negative_button">Cancel</string>
|
||||
<string name="playlist_chooser_dialog_neutral_button">Create</string>
|
||||
<string name="playlist_chooser_dialog_title">Add to a playlist</string>
|
||||
<string name="playlist_counted_tracks">\" tracks\"</string>
|
||||
<string name="playlist_duration">\"Playlist duration: \"</string>
|
||||
<string name="playlist_counted_tracks">%1$d tracks</string>
|
||||
<string name="playlist_duration">Playlist duration: %1$s</string>
|
||||
<string name="playlist_editor_dialog_hint_name">Playlist Name</string>
|
||||
<string name="playlist_editor_dialog_negative_button">Cancel</string>
|
||||
<string name="playlist_editor_dialog_neutral_button">Delete</string>
|
||||
<string name="playlist_editor_dialog_positive_button">Save</string>
|
||||
<string name="playlist_editor_dialog_title">Create playlist</string>
|
||||
<string name="playlist_info_song_count">\"Song count: \"</string>
|
||||
<string name="playlist_info_song_count">Song count: %1$d</string>
|
||||
<string name="playlist_page_play_button">Play</string>
|
||||
<string name="playlist_page_shuffle_button">Shuffle</string>
|
||||
<string name="playlist_song_count">\"Song count: \"</string>
|
||||
<string name="playlist_song_count">Song count: %1$d</string>
|
||||
<string name="rating_dialog_negative_button">Cancel</string>
|
||||
<string name="rating_dialog_positive_button">Save</string>
|
||||
<string name="rating_dialog_title">Rate</string>
|
||||
|
|
@ -162,13 +162,17 @@
|
|||
<string name="song_bottom_sheet_play_next">Play next</string>
|
||||
<string name="song_bottom_sheet_rate">Rate</string>
|
||||
<string name="song_bottom_sheet_remove">Remove</string>
|
||||
<string name="song_list_page_all">: all tracks</string>
|
||||
<string name="song_list_page_all">%1$s: all tracks</string>
|
||||
<string name="song_list_page_downloaded">Downloaded</string>
|
||||
<string name="song_list_page_most_played">Most played tracks</string>
|
||||
<string name="song_list_page_recently_added">Recently added tracks</string>
|
||||
<string name="song_list_page_recently_played">Recently played tracks</string>
|
||||
<string name="song_list_page_starred">Starred tracks</string>
|
||||
<string name="song_list_page_title">Songs</string>
|
||||
<string name="song_list_page_top">\'s top tracks</string>
|
||||
<string name="song_list_page_year">\"Year \"</string>
|
||||
<string name="song_list_page_top">%1$s\'s top tracks</string>
|
||||
<string name="song_list_page_year">Year %1$d</string>
|
||||
<string name="server_unreachable_dialog_negative_button">Cancel</string>
|
||||
<string name="server_unreachable_dialog_neutral_button">Go to login</string>
|
||||
<string name="server_unreachable_dialog_positive_button">OK</string>
|
||||
<string name="server_unreachable_dialog_title">Server unreachable</string>
|
||||
</resources>
|
||||
Loading…
Add table
Add a link
Reference in a new issue