Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion panels/notification/center/notifyitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,12 @@ void AppNotifyItem::updateTime()
} else if (minute > 0 && minute < 60) {
ret = tr("%1 minutes ago").arg(minute);
} else {
ret = tr("%1 hours ago").arg(minute / 60);
const auto hour = minute / 60;
if (hour == 1) {
ret = tr("1 hour ago");
} else {
ret = tr("%1 hours ago").arg(hour);
}
}
} else if (elapsedDay >= 1 && elapsedDay < 2) {
ret = tr("Yesterday ") + " " + time.toString("hh:mm");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,20 @@
<context>
<name>GroupNotify</name>
<message>
<location filename="../GroupNotify.qml" line="50"/>
<location filename="../GroupNotify.qml" line="51"/>
<source>Clear All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NotifyHeader</name>
<message>
<location filename="../NotifyHeader.qml" line="20"/>
<source>Notification Setting</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="56"/>
<location filename="../NotifyHeader.qml" line="42"/>
<source>Notification Center</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="108"/>
<location filename="../NotifyHeader.qml" line="90"/>
<source>Clear All</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -48,22 +43,27 @@
<context>
<name>notifycenter::AppNotifyItem</name>
<message>
<location filename="../notifyitem.cpp" line="76"/>
<location filename="../notifyitem.cpp" line="78"/>
<source>Just now</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="78"/>
<location filename="../notifyitem.cpp" line="80"/>
<source>%1 minutes ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="80"/>
<location filename="../notifyitem.cpp" line="84"/>
<source>1 hour ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="86"/>
<source>%1 hours ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="83"/>
<location filename="../notifyitem.cpp" line="90"/>
<source>Yesterday </source>
<translation type="unfinished"></translation>
</message>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="az">
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="az">
<context>
<name>GroupNotify</name>
<message>
<location filename="../GroupNotify.qml" line="50"/>
<location filename="../GroupNotify.qml" line="51"/>
<source>Clear All</source>
<translation>مسح الكل</translation>
</message>
</context>
<context>
<name>NotifyHeader</name>
<message>
<location filename="../NotifyHeader.qml" line="20"/>
<source>Notification Setting</source>
<translation>إعداد الإشعارات</translation>
<translation type="vanished">إعداد الإشعارات</translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="56"/>
<location filename="../NotifyHeader.qml" line="42"/>
<source>Notification Center</source>
<translation>مركز الإشعارات</translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="108"/>
<location filename="../NotifyHeader.qml" line="90"/>
<source>Clear All</source>
<translation>مسح الكل</translation>
</message>
Expand All @@ -46,24 +47,29 @@
<context>
<name>notifycenter::AppNotifyItem</name>
<message>
<location filename="../notifyitem.cpp" line="76"/>
<location filename="../notifyitem.cpp" line="78"/>
<source>Just now</source>
<translation>الآن</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="78"/>
<location filename="../notifyitem.cpp" line="80"/>
<source>%1 minutes ago</source>
<translation>%1 دقيقة مضت</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="80"/>
<location filename="../notifyitem.cpp" line="84"/>
<source>1 hour ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="86"/>
<source>%1 hours ago</source>
<translation>%1 ساعة مضت</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="83"/>
<location filename="../notifyitem.cpp" line="90"/>
<source>Yesterday </source>
<translation>أمس </translation>
</message>
</context>
</TS>
</TS>
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,20 @@
<context>
<name>GroupNotify</name>
<message>
<location filename="../GroupNotify.qml" line="50"/>
<location filename="../GroupNotify.qml" line="51"/>
<source>Clear All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NotifyHeader</name>
<message>
<location filename="../NotifyHeader.qml" line="20"/>
<source>Notification Setting</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="56"/>
<location filename="../NotifyHeader.qml" line="42"/>
<source>Notification Center</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="108"/>
<location filename="../NotifyHeader.qml" line="90"/>
<source>Clear All</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -48,22 +43,27 @@
<context>
<name>notifycenter::AppNotifyItem</name>
<message>
<location filename="../notifyitem.cpp" line="76"/>
<location filename="../notifyitem.cpp" line="78"/>
<source>Just now</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="78"/>
<location filename="../notifyitem.cpp" line="80"/>
<source>%1 minutes ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="80"/>
<location filename="../notifyitem.cpp" line="84"/>
<source>1 hour ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="86"/>
<source>%1 hours ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="83"/>
<location filename="../notifyitem.cpp" line="90"/>
<source>Yesterday </source>
<translation type="unfinished"></translation>
</message>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ca">
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ca">
<context>
<name>GroupNotify</name>
<message>
<location filename="../GroupNotify.qml" line="50"/>
<location filename="../GroupNotify.qml" line="51"/>
<source>Clear All</source>
<translation>Neteja-ho tot</translation>
</message>
</context>
<context>
<name>NotifyHeader</name>
<message>
<location filename="../NotifyHeader.qml" line="20"/>
<source>Notification Setting</source>
<translation>Configuració de les notificacions</translation>
<translation type="vanished">Configuració de les notificacions</translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="56"/>
<location filename="../NotifyHeader.qml" line="42"/>
<source>Notification Center</source>
<translation>Centre de notificacions</translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="108"/>
<location filename="../NotifyHeader.qml" line="90"/>
<source>Clear All</source>
<translation>Neteja-ho tot</translation>
</message>
Expand All @@ -46,24 +47,29 @@
<context>
<name>notifycenter::AppNotifyItem</name>
<message>
<location filename="../notifyitem.cpp" line="76"/>
<location filename="../notifyitem.cpp" line="78"/>
<source>Just now</source>
<translation>Ara mateix</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="78"/>
<location filename="../notifyitem.cpp" line="80"/>
<source>%1 minutes ago</source>
<translation>Fa %1 minuts</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="80"/>
<location filename="../notifyitem.cpp" line="84"/>
<source>1 hour ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="86"/>
<source>%1 hours ago</source>
<translation>Fa %1 hores</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="83"/>
<location filename="../notifyitem.cpp" line="90"/>
<source>Yesterday </source>
<translation>Ahir</translation>
</message>
</context>
</TS>
</TS>
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es">
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="es">
<context>
<name>GroupNotify</name>
<message>
<location filename="../GroupNotify.qml" line="50"/>
<location filename="../GroupNotify.qml" line="51"/>
<source>Clear All</source>
<translation>Limpiar todo</translation>
</message>
</context>
<context>
<name>NotifyHeader</name>
<message>
<location filename="../NotifyHeader.qml" line="20"/>
<source>Notification Setting</source>
<translation>Ajustes de notificaciones</translation>
<translation type="vanished">Ajustes de notificaciones</translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="56"/>
<location filename="../NotifyHeader.qml" line="42"/>
<source>Notification Center</source>
<translation>Centro de notificaciones</translation>
</message>
<message>
<location filename="../NotifyHeader.qml" line="108"/>
<location filename="../NotifyHeader.qml" line="90"/>
<source>Clear All</source>
<translation>Limpiar todo</translation>
</message>
Expand All @@ -46,24 +47,29 @@
<context>
<name>notifycenter::AppNotifyItem</name>
<message>
<location filename="../notifyitem.cpp" line="76"/>
<location filename="../notifyitem.cpp" line="78"/>
<source>Just now</source>
<translation>Ahora mismo</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="78"/>
<location filename="../notifyitem.cpp" line="80"/>
<source>%1 minutes ago</source>
<translation>Hace %1 minutos</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="80"/>
<location filename="../notifyitem.cpp" line="84"/>
<source>1 hour ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="86"/>
<source>%1 hours ago</source>
<translation>Hace %1 horas</translation>
</message>
<message>
<location filename="../notifyitem.cpp" line="83"/>
<location filename="../notifyitem.cpp" line="90"/>
<source>Yesterday </source>
<translation>Ayer </translation>
</message>
</context>
</TS>
</TS>
Loading