Merge pull request #382 from wutschel/fix_strings

Bugfix: Fix some translations while search and in more items view
xbmc · Sep 17, 2021 · f32dcea · f32dcea
2 parents 7faa1d3 + 825db36
commit f32dcea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/XBMC Remote/DetailViewController.m b/XBMC Remote/DetailViewController.m
@@ -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;
@@ -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");

diff --git a/XBMC Remote/SVPullToRefresh/UIScrollView+SVPullToRefresh.m b/XBMC Remote/SVPullToRefresh/UIScrollView+SVPullToRefresh.m
@@ -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;