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.

Sign up for GitHub

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

Jump to bottom

Bugfix: Go back to %d formatting to use existing translations #382

Merged
merged 2 commits into from
Sep 17, 2021
Merged

Bugfix: Go back to %d formatting to use existing translations #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bafc543
Go back to %d formatting to use existing translations
wutschel Sep 2, 2021
825db36
Remove not needed "Pull to refresh..."
wutschel Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions XBMC Remote/DetailViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,13 +623,13 @@ - (IBAction)showMore:(id)sender {
}

[self AnimView:moreItemsViewController.view AnimDuration:0.3 Alpha:1.0 XPos:0];
self.navigationItem.title = [NSString stringWithFormat:LOCALIZED_STR(@"More (%ld)"), (long)(count - MAX_NORMAL_BUTTONS)];
self.navigationItem.title = [NSString stringWithFormat:LOCALIZED_STR(@"More (%d)"), (int)(count - MAX_NORMAL_BUTTONS)];
if (IS_IPAD) {
[UIView beginAnimations:nil context:nil];
[UIView setAnimationDuration:0.3];
topNavigationLabel.alpha = 0;
[UIView commitAnimations];
topNavigationLabel.text = [NSString stringWithFormat:LOCALIZED_STR(@"More (%ld)"), (long)(count - MAX_NORMAL_BUTTONS)];
topNavigationLabel.text = [NSString stringWithFormat:LOCALIZED_STR(@"More (%d)"), (int)(count - MAX_NORMAL_BUTTONS)];
[UIView beginAnimations:nil context:nil];
[UIView setAnimationDuration:0.1];
topNavigationLabel.alpha = 1;
Expand Down Expand Up @@ -1807,7 +1807,7 @@ - (NSString*)tableView:(UITableView*)tableView titleForHeaderInSection:(NSIntege
int numResult = (int)[self.filteredListContent count];
if (numResult) {
if (numResult != 1) {
return [NSString stringWithFormat:LOCALIZED_STR(@"%lu results"), (unsigned long)[self.filteredListContent count]];
return [NSString stringWithFormat:LOCALIZED_STR(@"%d results"), (int)self.filteredListContent.count];
}
else {
return LOCALIZED_STR(@"1 result");
Expand Down
1 change: 0 additions & 1 deletion XBMC Remote/SVPullToRefresh/UIScrollView+SVPullToRefresh.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,6 @@ - (UIActivityIndicatorView*)activityIndicatorView {
- (UILabel*)titleLabel {
if (!_titleLabel) {
_titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 210, 20)];
_titleLabel.text = LOCALIZED_STR(@"Pull to refresh...");
_titleLabel.font = [UIFont boldSystemFontOfSize:13];
_titleLabel.numberOfLines = 1;
_titleLabel.minimumScaleFactor = 12.0/13.0;
Expand Down