Merge branch 'tryphon-rdairplay-fix-point-encoding'

This commit is contained in:
Fred Gleason 2014-09-20 22:16:53 -04:00
commit e7d437f497
2 changed files with 4 additions and 3 deletions

View File

@ -14492,3 +14492,5 @@
2014-09-19 Alban Peignier <alban@tryphon.eu>
* Fixed 'web/rdxport/carts.cpp' which tried to create associated group
during cart creation
2014-09-20 Alban Peignier <alban@tryphon.eu>
* Fixes 'Next Timed Start: [nn:nn:nn]' encoding in RdAirPlay

View File

@ -138,9 +138,8 @@ void PostCounter::UpdateDisplay()
}
if(isEnabled()&&(!post_time.isNull())) {
str=QString(tr("Next Timed Start"));
point=QString().sprintf("%s [%s]",(const char *)str,
(const char *)post_time.toString(post_time_format));
point= trUtf8("Next Timed Start") + " [" + post_time.toString(post_time_format) + "]";
if(post_offset_valid) {
if(offset<-POST_COUNTER_MARGIN) {
state=QString().sprintf("-%s",(const char *)