ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Review: Needs Fixing

1 inline comment.

Diff comments:

> 
> === modified file 'app/components/DigitalMode.qml'
> --- app/components/DigitalMode.qml	2015-09-16 15:13:36 +0000
> +++ app/components/DigitalMode.qml	2015-10-13 11:12:23 +0000
> @@ -81,17 +84,20 @@
>          font.pixelSize: units.dp(1)
>          visible: text !== ""
>          text: {
> -            if (localizedTimeString.search(Qt.locale().amText) !== -1) {
> -                // 12 hour format detected with the localised AM text
> -                return Qt.locale().amText
> -            }
> -            else if (localizedTimeString.search(Qt.locale().pmText) !== -1) {
> -                // 12 hour format detected with the localised PM text
> -                return Qt.locale().pmText
> -            }
> -            else {
> -                // 24-hour format detected
> -                return ""
> +            // Fix for lp:1384739

This code needs to be removed from this MP. It is associated with a different issue.

Or if you can not do that, it needs to have the other branch as a prerequisite.

> +            if (localizedTimeString.split(" ").length > 1) {
> +                localizedTimeString.split(" ")[1] 
> +            } else {
> +                if (localizedTimeString.search(Qt.locale().amText) !== -1) {
> +                    // 12 hour format detected with the localised AM text
> +                    return Qt.locale().amText
> +                } else if (localizedTimeString.search(Qt.locale().pmText) !== -1) {
> +                    // 12 hour format detected with the localised PM text
> +                    return Qt.locale().pmText
> +                } else {
> +                    // 24-hour format detected
> +                    return ""
> +                }
>              }
>          }
>      }


-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-order-fix/+merge/274236
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.