Merge pull request #13 from WikiaUsers/release-1.1.5

Release 1.1.5

Author: KockaAdmiralac

i18n/_list.json

@@ -5,6 +5,7 @@
     "pl": "Polski",
     "ru": "Русский",
     "sr": "Српски",
+    "tr": "Türkçe",
     "uk": "Українська",
     "zh-hans": "简体中文",
     "zh-hant": "繁體中文"

i18n/tr.json

@@ -0,0 +1,21 @@
+{
+    "language": "Türkçe",
+    "name": "Wikia Nitro",
+    "logo": "Zaman geldi. Herkese GIF avatarları!",
+    "login": "Giriş Yap",
+    "logout": "Çıkış Yap",
+    "username": "Kullanıcı Adı",
+    "password": "Şifre",
+    "filetype": "GIF fotoğraflar",
+    "select": "Seç",
+    "upload": "Yükle",
+    "upload-header": "Avatar Güncelle",
+    "login-success": "Başarılıyla giriş yapıldı!",
+    "login-badpass": "Yanlış kullanıcı adı ya da şifre!",
+    "login-unknown": "Giriş yaparken bilinmeyen bir hata oluştu.",
+    "login-auto": "Otomatik olarak giriş yapıldı!",
+    "upload-success": "Avatar başarıyla yüklendi!",
+    "upload-badsize": "Avatar 512kB'den büyük veya kare şeklinde değil.",
+    "upload-lstat": "Avatar boyutu belirlenemedi.",
+    "upload-unknown": "Avatar yüklenirken bilinmeyen bir hata oluştu."
+}

js/main.js

@@ -196,16 +196,16 @@ function cbLstat(err, {size}) {
  * Shows the upload file dialog.
  * @param {Event} e DOM event that triggered enabling of the upload
  */
-function setupUpload(e) {
+async function setupUpload(e) {
     e.preventDefault();
-    const files = dialog.showOpenDialog({
+    const dialogResult = await dialog.showOpenDialog({
         filters: [{
             extensions: ['gif'],
             name: i18n.filetype
         }]
     });
-    if (files) {
-        avatarFile = files[0];
+    if (!dialogResult.canceled) {
+        avatarFile = dialogResult.filePaths[0];
         fs.lstat(avatarFile, cbLstat);
     } else {
         uploadForm.submit.disabled = true;

main.js

@@ -17,6 +17,9 @@ let mainWindow;
 function createWindow() {
     mainWindow = new BrowserWindow({
         height: 900,
+        webPreferences: {
+            nodeIntegration: true
+        },
         width: 1200
     });
     mainWindow.maximize();

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "wikia-nitro",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "description": "Allows uploading of GIF avatars to Fandom",
     "homepage": "https://dev.fandom.com/wiki/Nitro",
     "author": {
@@ -24,6 +24,10 @@
         {
             "name": "铁桶",
             "url": "https://dev.fandom.com/wiki/User:铁桶"
+        },
+        {
+            "name": "BaRaN6161TURK",
+            "url": "https://dev.fandom.com/wiki/User:BaRaN6161TURK"
         }
     ],
     "main": "main.js",
@@ -39,12 +43,12 @@
     },
     "license": "CC-BY-SA-4.0",
     "dependencies": {
-        "jimp": ">=0.6.0",
+        "jimp": ">=0.6.4",
         "request": ">=2.88.0",
         "request-promise-native": ">=1.0.7"
     },
     "devDependencies": {
-        "electron": ">=4.1.0",
-        "eslint": ">=5.15.2"
+        "electron": ">=6.0.2",
+        "eslint": ">=6.2.0"
     }
 }

package.json

@@ -6,7 +6,7 @@ rm -rf wikia-nitro-*
 rm -rf *.zip
 # Generate all builds.
 echo "Generating new builds..."
-electron-packager .. --all --electron-version=4.1.0
+electron-packager .. --all --electron-version=6.0.2
 # Windows.
 echo "Packaging Windows builds..."
 zip -qr win32-ia32 wikia-nitro-win32-ia32
@@ -18,7 +18,7 @@ zip -qr linux-arm64 wikia-nitro-linux-arm64
 zip -qr linux-armv7l wikia-nitro-linux-armv7l
 # Mac.
 echo "Packaging macOS builds..."
-zip -qr mas-x64 wikia-nitro-mas-x64
+# zip -qr mas-x64 wikia-nitro-mas-x64
 zip -qr darwin-x64 wikia-nitro-darwin-x64
 
 echo "Done."