github_mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2025-02-02 23:28:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into patch-1

Browse Source
This commit is contained in:
Nariman Jelveh 2024-12-07 11:45:17 -08:00 committed by GitHub
commit f97394ded1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/src/UI/UITaskbarItem.js
View File

@ -67,14 +67,37 @@ function UITaskbarItem(options){
// fade in the taskbar item // fade in the taskbar item
$(el_taskbar_item).show(50); $(el_taskbar_item).show(50);
$(el_taskbar_item).on("click", function(){ $(el_taskbar_item).on("click", function(e){
e.preventDefault();
e.stopPropagation();
// If this item has an open context menu, don't do anything // If this item has an open context menu, don't do anything
if($(el_taskbar_item).hasClass('has-open-contextmenu')) if($(el_taskbar_item).hasClass('has-open-contextmenu'))
return; return;
el_taskbar_item.querySelector("img").animate(
[
{ transform: 'translateY(0) scale(1)' },
{ transform: 'translateY(-5px) scale(1.2)' },
{ transform: 'translateY(0) scale(1)' }
],
{
duration: 300,
easing: 'ease-out',
}
);
if(options.onClick === undefined || options.onClick(el_taskbar_item) === false){ if(options.onClick === undefined || options.onClick(el_taskbar_item) === false){
const clicked_window = $(`.window[data-app="${options.app}"]`)
// hide window, unless there's more than one in app group
if (clicked_window.hasClass("window-active") && clicked_window.length < 2) {
clicked_window.hideWindow();
return;
}
// re-show each window in this app group // re-show each window in this app group
$(`.window[data-app="${options.app}"]`).showWindow(); clicked_window.showWindow();
} }
}) })

60
src/gui/src/i18n/translations/id.js
View File

@ -383,55 +383,53 @@ const id = {
"You can't share with yourself.": "Anda tidak bisa membaginya dengan diri sendiri.", // In English: "You can't share with yourself." "You can't share with yourself.": "Anda tidak bisa membaginya dengan diri sendiri.", // In English: "You can't share with yourself."
"This user already has access to this item": "Pengguna ini telah memiliki akses ke barang ini", // In English: "This user already has access to this item" "This user already has access to this item": "Pengguna ini telah memiliki akses ke barang ini", // In English: "This user already has access to this item"
// ---------------------------------------- "billing.change_payment_method": "Ubah", // In English: "Change"
// Missing translations:
// ----------------------------------------
"billing.change_payment_method": "Ganti", // In English: "Change"
"billing.cancel": "Batal", // In English: "Cancel" "billing.cancel": "Batal", // In English: "Cancel"
"billing.download_invoice": "Unduh", // In English: "Download" "billing.download_invoice": "Unduh", // In English: "Download"
"billing.payment_method": "Metode Pembayaran", // In English: "Payment Method" "billing.payment_method": "Metode Pembayaran", // In English: "Payment Method"
"billing.payment_method_updated": "Metode Pembayaran Diperbarui", // In English: "Payment method updated!" "billing.payment_method_updated": "Metode pembayaran diperbarui!", // In English: "Payment method updated!"
"billing.confirm_payment_method": "Konfirmasi Metode Pembayaran", // In English: "Confirm Payment Method" "billing.confirm_payment_method": "Konfirmasi Metode Pembayaran", // In English: "Confirm Payment Method"
"billing.payment_history": "Riwayat Pembayaran", // In English: "Payment History" "billing.payment_history": "Riwayat Pembayaran", // In English: "Payment History"
"billing.refunded": "Dikembalikan", // In English: "Refunded" "billing.refunded": "Dikembalikan", // In English: "Refunded"
"billing.paid": "Dibayarkan", // In English: "Paid" "billing.paid": "Dibayar", // In English: "Paid"
"billing.ok": "Ok", // In English: "OK" "billing.ok": "OK", // In English: "OK"
"billing.resume_subscription": "Lanjutkan Langgganan", // In English: "Resume Subscription" "billing.resume_subscription": "Lanjutkan Berlangganan", // In English: "Resume Subscription"
"billing.subscription_cancelled": "Langganan anda dibatalakan", // In English: "Your subscription has been canceled." "billing.subscription_cancelled": "Langganan Anda telah dibatalkan.", // In English: "Your subscription has been canceled."
"billing.subscription_cancelled_description": "Anda tetap memiliki akses ke langganan sampai akhir dari periode penagihan", // In English: "You will still have access to your subscription until the end of this billing period." "billing.subscription_cancelled_description": "Anda masih memiliki akses ke langganan Anda hingga akhir periode penagihan ini.", // In English: "You will still have access to your subscription until the end of this billing period."
"billing.offering.free": "Gratis", // In English: "Free" "billing.offering.free": "Gratis", // In English: "Free"
"billing.offering.pro": "Profesional", // In English: "Professional" "billing.offering.pro": "Profesional", // In English: "Professional"
"billing.offering.business": "Bisnis", // In English: "Business" "billing.offering.business": "Bisnis", // In English: "Business"
"billing.cloud_storage": "Penyimpanan Cloud", // In English: "Cloud Storage" "billing.cloud_storage": "Penyimpanan Cloud", // In English: "Cloud Storage"
"billing.ai_access": "Akses AI", // In English: "AI Access" "billing.ai_access": "Akses AI", // In English: "AI Access"
"billing.bandwidth": "Bandwidth", // In English: "Bandwidth" "billing.bandwidth": "Bandwidth", // In English: "Bandwidth"
"billing.apps_and_games": "Aplikasi & Permainan", // In English: "Apps & Games" "billing.apps_and_games": "Aplikasi & Game", // In English: "Apps & Games"
"billing.upgrade_to_pro": "Perbarui ke %strong%", // In English: "Upgrade to %strong%" "billing.switch_to": "Beralih ke %strong%", // In English: "Switch to %strong%"
"billing.switch_to": "Ganti ke %strong%", // In English: "Switch to %strong%" "billing.payment_setup": "Pengaturan Pembayaran", // In English: "Payment Setup"
"billing.payment_setup": "Atur Pembayaran", // In English: "Payment Setup"
"billing.back": "Kembali", // In English: "Back" "billing.back": "Kembali", // In English: "Back"
"billing.you_are_now_subscribed_to": "Anda Sekarang berlangganan %strong%", // In English: "You are now subscribed to %strong% tier." "billing.you_are_now_subscribed_to": "Anda sekarang berlangganan paket %strong%.", // In English: "You are now subscribed to %strong% tier."
"billing.you_are_now_subscribed_to_without_tier": "Anda Sekarang Berlangganan", // In English: "You are now subscribed" "billing.you_are_now_subscribed_to_without_tier": "Anda sekarang berlangganan", // In English: "You are now subscribed"
"billing.subscription_cancellation_confirmation": "Anda yakin ingin membatalkan langganan?", // In English: "Are you sure you want to cancel your subscription?" "billing.subscription_cancellation_confirmation": "Apakah Anda yakin ingin membatalkan langganan Anda?", // In English: "Are you sure you want to cancel your subscription?"
"billing.subscription_setup": "Atur Langganan", // In English: "Subscription Setup" "billing.subscription_setup": "Pengaturan Langganan", // In English: "Subscription Setup"
"billing.cancel_it": "Batalkan", // In English: "Cancel It" "billing.cancel_it": "Batalkan", // In English: "Cancel It"
"billing.keep_it": "Pertahankan", // In English: "Keep It" "billing.keep_it": "Pertahankan", // In English: "Keep It"
"billing.subscription_resumed": "Langganan %strong% anda telah dilanjutkan" , // In English: "Your %strong% subscription has been resumed!" "billing.subscription_resumed": "Langganan %strong% Anda telah dilanjutkan!", // In English: "Your %strong% subscription has been resumed!"
"billing.upgrade_now": "Perbarui Sekarang", // In English: "Upgrade Now" //Note: literal translation of 'upgrade' is 'tingkatkan' but for this context 'upgrade' more commonly used
"billing.upgrade": "Perbarui", // In English: "Upgrade" "billing.upgrade": "Upgrade", // In English: "Upgrade"
"billing.currently_on_free_plan": "Anda Sekarang berada dalam paket gratis", // In English: "You are currently on the free plan." "billing.upgrade_to_pro": "Upgrade ke %strong%", // In English: "Upgrade to %strong%"
"billing.download_receipt": "Unduh Struk", // In English: "Download Receipt" "billing.upgrade_now": "Upgrade Sekarang", // In English: "Upgrade Now"
"billing.subscription_check_error": "Ada Masalah ketika mengecek status langgangan anda", // In English: "A problem occurred while checking your subscription status." "billing.currently_on_free_plan": "Anda saat ini menggunakan paket gratis.", // In English: "You are currently on the free plan."
"billing.email_confirmation_needed": "Email anda belum dikonfirmasi. Kami akan mengirimkan kode untuk konfirmasinya", // In English: "Your email has not been confirmed. We'll send you a code to confirm it now." "billing.download_receipt": "Unduh Bukti Pembayaran", // In English: "Download Receipt"
"billing.sub_cancelled_but_valid_until": "Anda telah membatalkan langganan dan otomatis beralih ke paket gratis yang akan berakhir pada akhir periode penagihan. Anda tidak akan dikenakan biaya sampai anda berlangganan kembali", // In English: "You have cancelled your subscription and it will automatically switch to the free tier at the end of the billing period. You will not be charged again unless you re-subscribe." "billing.subscription_check_error": "Terjadi masalah saat memeriksa status langganan Anda.", // In English: "A problem occurred while checking your subscription status."
"billing.current_plan_until_end_of_period": "Paket anda akan berakhir sampai akhir periode penagihan", // In English: "Your current plan until the end of this billing period." "billing.email_confirmation_needed": "Email Anda belum dikonfirmasi. Kami akan mengirimkan kode untuk mengonfirmasinya sekarang.", // In English: "Your email has not been confirmed. We'll send you a code to confirm it now."
"billing.current_plan": "Paket saat ini ", // In English: "Current plan" "billing.sub_cancelled_but_valid_until": "Anda telah membatalkan langganan Anda dan secara otomatis akan beralih ke paket gratis di akhir periode penagihan. Anda tidak akan dikenakan biaya lagi kecuali Anda berlangganan ulang.", // In English: "You have cancelled your subscription and it will automatically switch to the free tier at the end of the billing period. You will not be charged again unless you re-subscribe."
"billing.cancelled_subscription_tier": "Batalkan Langganan (%%)" // In English: "Cancelled Subscription (%%)" "billing.current_plan_until_end_of_period": "Paket Anda saat ini berlaku hingga akhir periode penagihan ini.", // In English: "Your current plan until the end of this billing period."
"billing.current_plan": "Paket saat ini", // In English: "Current plan"
"billing.cancelled_subscription_tier": "Langganan Dibatalkan (%%)", // In English: "Cancelled Subscription (%%)"
"billing.manage": "Kelola", // In English: "Manage" "billing.manage": "Kelola", // In English: "Manage"
"billing.limited": "Terbatas", // In English: "Limited" "billing.limited": "Terbatas", // In English: "Limited"
"billing.expanded": "Diperluas", // In English: "Expanded" "billing.expanded": "Diperluas", // In English: "Expanded"
"billing.accelerated": "Ditingkatkan", // In English: "Accelerated" "billing.accelerated": "Dipercepat", // In English: "Accelerated"
"billing.enjoy_msg": "Nikmati %% penyimpanan Cloud ditambah manfaat lainnya", // In English: "Enjoy %% of Cloud Storage plus other benefits." "billing.enjoy_msg": "Nikmati %% dari Penyimpanan Cloud dan manfaat lainnya." // In English: "Enjoy %% of Cloud Storage plus other benefits."
}, },
}; };