Brion VIBBER has submitted this change and it was merged.
Change subject: Diplay license name (instead of abbreviation) for uploaded
images.
......................................................................
Diplay license name (instead of abbreviation) for uploaded images.
Change-Id: I31db020086dca60f66b87112d2506af0ae27af58
---
M Commons-iOS/DetailScrollViewController.m
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Commons-iOS/DetailScrollViewController.m
b/Commons-iOS/DetailScrollViewController.m
index bf9b2a0..66dbddf 100644
--- a/Commons-iOS/DetailScrollViewController.m
+++ b/Commons-iOS/DetailScrollViewController.m
@@ -439,8 +439,12 @@
license = [license uppercaseString];
}
+ selectedLicenseIndex_ = [self getSelectedRecordLicenseIndex];
+
// Update licenseDefaultLabel to show name of found license
- self.licenseDefaultLabel.text = license;
+ //self.licenseDefaultLabel.text = [NSString stringWithFormat:@"%@ - %@",
selectableLicenses_[selectedLicenseIndex_][@"description"], license];
+
+ self.licenseDefaultLabel.text =
selectableLicenses_[selectedLicenseIndex_][@"description"];
}
#pragma mark - License choices
@@ -540,7 +544,8 @@
}
index++;
}
- return index;
+ // If no match was found assume the first entry in selectableLicenses_ is
the default one
+ return 0;
}
-(void)setLicenseSelectionIndication:(UILabelDynamicHeight *)label
--
To view, visit https://gerrit.wikimedia.org/r/88166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31db020086dca60f66b87112d2506af0ae27af58
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/commons
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
