Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: Ia1a520d983be096e29cfe725f619be0423f9d110
This commit is contained in:
jdlrobson 2018-01-08 16:37:28 -08:00
commit 09a1f98ab3
10 changed files with 63 additions and 36 deletions

View File

@ -30,7 +30,7 @@
"mobile-frontend-editor-tutorial-summary": "Ayuda a mejorar la página $1.<br />No le temas al código.",
"mobile-frontend-editor-unavailable": "La edición a través del móvil no está disponible en este navegador. Prueba con otro.",
"mobile-frontend-editor-undo-unsupported": "Actualmente no se admite la función Deshacer en los dispositivos móviles.",
"mobile-frontend-editor-uploadenable": "Primero sube una foto para habilitar la edición.",
"mobile-frontend-editor-uploadenable": "Para activar la edición, carga una fotografía primero.",
"mobile-frontend-history": "Ver el historial de ediciones de esta página.",
"mobile-frontend-home-button": "Inicio",
"mobile-frontend-language-article-heading": "Leer en otro idioma",

View File

@ -11,9 +11,15 @@
},
"minerva-talk-add-topic": "Eztabaida gehitu",
"mobile-frontend-editor-cta": "Lagundu orrialde hau hobetzen!",
"minerva-pointer-dismiss": "Baztertu",
"mobile-frontend-editor-edit": "Aldatu",
"minerva-download": "Deskargatu",
"mobile-frontend-editor-redlink-create": "Orrialdea sortu",
"mobile-frontend-editor-redlink-explain": "Orri hau oraindik ez da sortu.",
"mobile-frontend-editor-redlink-leave": "Ez, eskerrik asko.",
"mobile-frontend-editor-tutorial-cancel": "Ez, eskerrik asko",
"mobile-frontend-editor-tutorial-confirm": "Aldatzen hasi",
"mobile-frontend-editor-undo-unsupported": "Desegin ekintza gailu mugikorretan ez dago erabilgarri oraindik.",
"mobile-frontend-history": "Ikusi orrialde honen edizio-historia.",
"mobile-frontend-home-button": "Azala",
"mobile-frontend-language-article-heading": "Irakurri beste hizkuntza batean",
@ -26,10 +32,19 @@
"mobile-frontend-main-menu-nearby": "Gertukoak",
"mobile-frontend-main-menu-settings": "Ezarpenak",
"mobile-frontend-main-menu-watchlist": "Jarraipen zerrenda",
"mobile-frontend-meta-data-issues": "Orriaren arazoak",
"mobile-frontend-meta-data-issues-categories": "Kategoria honi buruz",
"mobile-frontend-meta-data-issues-header": "Arazoak",
"mobile-frontend-meta-data-issues-header-talk": "Orrialde honi buruz",
"mobile-frontend-meta-data-issues-talk": "Eztabaida orrialde honi buruz",
"mobile-frontend-notifications-filter": "Iragazkia",
"mobile-frontend-pageaction-edit-tooltip": "Orrialde honetako sarrera atala editatu",
"mobile-frontend-placeholder": "{{SITENAME}}bilatu",
"mobile-frontend-random-button": "Ausazkoa",
"mobile-frontend-redirected-from": "$1(e)tik birzuzenduta",
"mobile-frontend-talk-back-to-filepage": "\"$1\" fitxategira bueltatu.",
"mobile-frontend-talk-back-to-page": "\"$1\" orrira bueltatu.",
"mobile-frontend-talk-back-to-projectpage": "\"$1\" proiektu orrira bueltatu.",
"mobile-frontend-user-button-tooltip": "Erakutsi nire jakinarazpenak",
"mobile-frontend-user-page-contributions": "Ekarpenak",
"mobile-frontend-user-page-talk": "Eztabaida",

View File

@ -25,7 +25,7 @@
"mobile-frontend-editor-blocked-info-loggedin": "Votre compte est bloqué et ne peut faire de modifications. Le blocage a été mis en place par {{GENDER:$2|$2}} pour la raison suivante : $1",
"mobile-frontend-editor-cta": "Aidez à améliorer cette page!",
"minerva-pointer-dismiss": "Fermer",
"mobile-frontend-editor-disabled": "Cette page est protégée pour éviter le vandalisme.",
"mobile-frontend-editor-disabled": "Cette page est protégée pour empêcher le vandalisme.",
"mobile-frontend-editor-edit": "Modifier",
"minerva-download": "Télécharger",
"mobile-frontend-editor-redlink-create": "Créer une page",

View File

@ -1,10 +1,11 @@
{
"@metadata": {
"authors": [
"Giromin Cangiaxo"
"Giromin Cangiaxo",
"S4b1nuz E.656"
]
},
"mobile-frontend-editor-edit": "cangia",
"mobile-frontend-editor-edit": "Modìfica",
"mobile-frontend-home-button": "Paggina prinçipâ",
"mobile-frontend-language-article-heading": "Lezi inte n'atra lengua",
"mobile-frontend-main-menu-button-tooltip": "Arvi o menù prinçipâ",
@ -14,5 +15,6 @@
"mobile-frontend-main-menu-watchlist": "Sotta oservaçion",
"mobile-frontend-pageaction-edit-tooltip": "Modiffica a primma seçion de sta paggina.",
"mobile-frontend-placeholder": "Çerca {{SITENAME}}",
"mobile-frontend-random-button": "Una paggina a brettio"
"mobile-frontend-random-button": "Una paggina a brettio",
"mobile-frontend-user-page-talk": "Discusción"
}

View File

@ -8,16 +8,20 @@
"Simon Shek",
"Waihorace",
"Wwycheuk",
"一個正常人"
"一個正常人",
"Kly"
]
},
"minerva-last-modified-date": "最後編輯於 $1 $2",
"minerva-talk-add-topic": "新增討論",
"mobile-frontend-console-recruit": "\\o/ 嘿!這是套開放原始碼軟體,我們需要志工們來協助打造、改善,以及修正在 JavaScript 主控台裡所發現的程式錯誤!\n\n您可以在 https://phabricator.wikimedia.org/project/profile/67/ 查看我們的積壓事項",
"mobile-frontend-cookies-required": "切換檢視模式需要開啟 Cookies請先開啟後再重試。",
"mobile-frontend-editor-blocked-info-loggedin": "您的帳號已被封鎖禁止編輯,封鎖您的人為 {{GENDER:$1|$1}},由於下列原因:$2",
"mobile-frontend-editor-blocked-info-loggedin": "您的帳號已被封鎖禁止編輯,封鎖您的人為 {{GENDER:$2|$2}},由於下列原因:$1",
"mobile-frontend-editor-cta": "協助改善此頁面!",
"minerva-pointer-dismiss": "關閉",
"mobile-frontend-editor-disabled": "此頁面已被保護以防止惡意破壞。",
"mobile-frontend-editor-edit": "編輯",
"minerva-download": "下載",
"mobile-frontend-editor-redlink-create": "建立頁面",
"mobile-frontend-editor-redlink-explain": "此頁面尚未被建立。",
"mobile-frontend-editor-redlink-leave": "不用了,謝謝。",
@ -26,11 +30,12 @@
"mobile-frontend-editor-tutorial-summary": "試著改進 $1 頁面。<br />別害怕標籤語言。",
"mobile-frontend-editor-unavailable": "手機編輯器尚不支援您的瀏覽器。請嘗試使用其他瀏覽器。",
"mobile-frontend-editor-undo-unsupported": "手機裝置目前尚未支援還原。",
"mobile-frontend-editor-uploadenable": "請先上傳一張照片然後編輯。",
"mobile-frontend-editor-uploadenable": "請先上傳一張照片然後啟動編輯。",
"mobile-frontend-history": "檢視此頁面的編輯歷史。",
"mobile-frontend-home-button": "首頁",
"mobile-frontend-language-article-heading": "以其他語言閱讀",
"mobile-frontend-language-change": "變更語言",
"mobile-frontend-languages-not-available": "此頁面沒有其它可用的語言版本。",
"mobile-frontend-logged-in-homepage-notification": "{{GENDER:$1|歡迎}}$1",
"mobile-frontend-main-menu-button-tooltip": "開啟主選單",
"mobile-frontend-main-menu-contributions": "貢獻",
@ -45,19 +50,20 @@
"mobile-frontend-meta-data-issues-header-talk": "關於此頁面",
"mobile-frontend-meta-data-issues-talk": "關於此對話頁面",
"mobile-frontend-notifications-filter": "篩選器",
"mobile-frontend-pageaction-edit-tooltip": "編輯此頁面的導言章節",
"mobile-frontend-pageaction-edit-tooltip": "編輯此頁面的導言章節",
"mobile-frontend-placeholder": "搜尋 {{SITENAME}}",
"mobile-frontend-random-button": "隨機",
"mobile-frontend-redirected-from": "重新導向自 \"$1\"",
"mobile-frontend-talk-back-to-filepage": "返回到檔案 \"$1\" 。",
"mobile-frontend-talk-back-to-page": "返回 \"$1\" 頁面。",
"mobile-frontend-talk-back-to-projectpage": "返回到計畫頁面 \"$1\" 。",
"mobile-frontend-talk-back-to-projectpage": "返回到計畫頁面 \"$1\"。",
"mobile-frontend-talk-back-to-userpage": "返回到 \"{{GENDER:$1|$1}}\" 的使用者頁面。",
"mobile-frontend-user-button-tooltip": "顯示我的通知",
"mobile-frontend-user-newmessages": "您的對話頁面有新訊息",
"mobile-frontend-user-page-contributions": "貢獻",
"mobile-frontend-user-page-member-since": "自 $1 以來的{{GENDER:$2|成員}}",
"mobile-frontend-user-page-member-since": "{{GENDER:$2| 加入}}於 $1",
"mobile-frontend-user-page-talk": "討論",
"mobile-frontend-user-page-uploads": "上傳",
"skinname-minerva": "Minerva"
"skinname-minerva": "Minerva",
"minerva-skin-desc": "輕快的移動端優先外觀"
}

View File

@ -351,7 +351,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
* @return string|bool Timestamp in TS_ISO_8601 format, or false if no stored time
*/
protected function getEchoSeenTime( User $user ) {
return EchoSeenTime::newFromUser( $user )->getTime( 'all', /*flags*/ 0, TS_ISO_8601 );
return EchoSeenTime::newFromUser( $user )->getTime( 'all', TS_ISO_8601 );
}
/**

View File

@ -42,31 +42,29 @@ FIXME: Review all of these hacks to see if they still apply.
margin-left: 0 !important;
margin-right: 0 !important;
&.infobox > tbody > tr > td,
&.infobox > tbody > tr > th {
flex: 1 0;
}
&.infobox {
display: flex;
flex: 1 1 100%;
flex-flow: column nowrap;
font-size: 90%;
position: relative;
border: 1px solid @colorGray14;
margin-bottom: 2em;
text-align: left;
background-color: @colorGray15;
td:only-child,
th:only-child {
th, td {
vertical-align: top;
border: 0;
border-bottom: 1px solid @colorGray14;
padding: 7px 10px;
}
td {
width: 100%;
}
}
&.infobox > tbody {
display: flex;
flex-flow: column nowrap;
}
&.infobox > tbody > tr {
min-width: 100%;
display: flex;
flex-flow: row nowrap;
tr:last-child th,
tr:last-child td {
border: 0;
}
}
}
}

View File

@ -2,6 +2,7 @@
var msg = mw.msg,
MAX_PRINT_TIMEOUT = 3000,
GLYPH = 'mf-download',
Icon = M.require( 'mobile.startup/Icon' );
/**
@ -17,7 +18,7 @@
this.skin = skin;
options.tagName = 'li';
options.title = msg( 'minerva-download' );
options.name = 'download';
options.name = GLYPH;
Icon.call( this, options );
}
@ -33,7 +34,7 @@
* Restore download icon from spinner state
*/
hideSpinner: function () {
this.options.name = 'download';
this.options.name = GLYPH;
this.render();
},
isTemplateMode: false,

View File

@ -22,6 +22,11 @@ FIXME: Review all of these hacks to see if they still apply.
width: auto !important;
float: right !important;
clear: right !important;
td {
width: auto;
}
}
// banners inserted by other extensions, i.e. Zero
#mw-mf-page-center .mw-mf-banner {

View File

@ -171,7 +171,7 @@
"selector": ".mw-ui-icon-{name}:before",
"position": "bottom",
"images": {
"download": "resources/skins.minerva.icons.images.scripts/download.svg",
"mf-download": "resources/skins.minerva.icons.images.scripts/download.svg",
"watch": "resources/skins.minerva.icons.images.scripts/watch.svg",
"watched": "resources/skins.minerva.icons.images.scripts/watched.svg",
"user": "resources/skins.minerva.icons.images.scripts/userNormal.svg",