From 0a2bf3d8b6f79b4cc82fcfadd63a2bc13ad3e0d0 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 13:27:08 +0200 Subject: [PATCH 01/20] Create it-it.all.json Created the initial italian translation --- translations/it-it.all.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 translations/it-it.all.json diff --git a/translations/it-it.all.json b/translations/it-it.all.json new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/translations/it-it.all.json @@ -0,0 +1 @@ + From ca6adb6d3d6414c81fa1d33259f7ebeda2073465 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 13:36:49 +0200 Subject: [PATCH 02/20] Copied the english version. --- translations/it-it.all.json | 567 +++++++++++++++++++++++++++++++++++- 1 file changed, 566 insertions(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index 8b137891..ebdaa34d 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -1 +1,566 @@ - +[ + { + "id": "link", + "translation": "link" + }, + { + "id": "verify_email_title", + "translation": "Verify your email address for Nyaapantsu." + }, + { + "id": "verify_email_content", + "translation": "Please click below link to verify your email." + }, + { + "id": "reset_password_title", + "translation": "Reset your password for goyangi." + }, + { + "id": "reset_password_content", + "translation": "Please click below link to reset your password." + }, + { + "id":"register_title", + "translation": "Creating a new account" + }, + { + "id":"signup_box_title", + "translation": "Please Sign Up It's free and always will be." + }, + { + "id":"username", + "translation": "Username" + }, + { + "id":"email_address_or_username", + "translation": "Email Address or Username" + }, + { + "id":"email_address", + "translation": "Email Address" + }, + { + "id":"password", + "translation": "Password" + }, + { + "id":"confirm_password", + "translation": "Confirm Password" + }, + { + "id":"i_agree", + "translation": "I agree" + }, + { + "id":"terms_conditions_confirm", + "translation": "By clicking Register, you agree to the Terms and Conditions set out by this site, including our Cookie Use." + }, + { + "id":"signin", + "translation": "Sign In" + }, + { + "id":"register", + "translation": "Register" + }, + { + "id":"terms_conditions", + "translation": "Terms and Conditions" + }, + { + "id":"terms_conditions_full", + "translation": "Some Shit." + }, + { + "id":"remember_me", + "translation": "Remember me" + }, + { + "id":"forgot_password", + "translation": "Forgot Password?" + }, + { + "id":"sign_in_box_title", + "translation": "Please Sign In" + }, + { + "id":"sign_in_title", + "translation": "Sign In" + }, + { + "id":"register_success_title", + "translation": "Sign Up Successful" + }, + { + "id":"sign_up_success", + "translation": "Thank you for registering!" + }, + { + "id":"verify_success", + "translation": "Your account is now activated!" + }, + { + "id":"signup_verification_email", + "translation": "Finally, please check your mail inbox (and spam folder!) for the verification email." + }, + { + "id":"signup_verification_noemail", + "translation": "Registration was successful, you may now use your account." + }, + { + "id":"settings", + "translation": "Account Settings" + }, + { + "id":"torrents", + "translation": "Torrents" + }, + { + "id":"follow", + "translation": "Follow" + }, + { + "id":"unfollow", + "translation": "Unfollow" + }, + { + "id":"user_followed_msg", + "translation": "You have followed %s!" + }, + { + "id":"user_unfollowed_msg", + "translation": "You have unfollowed %s!" + }, + { + "id":"profile_page", + "translation": "%s Profile Page" + }, + { + "id":"see_more_torrents_from", + "translation": "See more torrents from %s " + }, + { + "id":"category", + "translation": "Category" + }, + { + "id": "name", + "translation": "Name" + }, + { + "id": "date", + "translation": "Date" + }, + { + "id": "size", + "translation": "Size" + }, + { + "id": "links", + "translation": "Links" + }, + { + "id": "home", + "translation": "Home" + }, + { + "id": "error_404", + "translation": "Error 404" + }, + { + "id": "toggle_navigation", + "translation": "Toggle navigation" + }, + { + "id": "upload", + "translation": "Upload" + }, + { + "id": "faq", + "translation": "FAQ" + }, + { + "id": "fap", + "translation": "Fap" + }, + { + "id": "advanced_search", + "translation": "Advanced Search" + }, + { + "id": "nothing_here", + "translation": "Nothing Here." + }, + { + "id": "404_not_found", + "translation": "404 Not Found" + }, + { + "id": "no_torrents_uploaded", + "translation": "No torrents uploaded yet!" + }, + { + "id": "profile", + "translation": "Profile" + }, + { + "id": "sign_out", + "translation": "Sign-out" + }, + { + "id": "member", + "translation": "Member" + }, + { + "id": "sign_in", + "translation": "Sign In" + }, + { + "id": "sign_up", + "translation": "Sign Up" + }, + { + "id": "no_results_found", + "translation": "No Results found" + }, + { + "id": "notice_keep_seeding", + "translation": "NOTICE: KEEP SEEDING AND ENABLE DHT YOU RETARD" + }, + { + "id": "official_nyaapocalipse_faq", + "translation": "Official Nyaapocalypse FAQ" + }, + { + "id": "links_replacement_mirror", + "translation": "Links for the replacement/mirror" + }, + { + "id": "what_happened", + "translation": "What happened?" + }, + { + "id": "nyaa_se_went_offline", + "translation": "nyaa.se and associated domains (such as nyaatorrents.info) went offline on May 01, 2017." + }, + { + "id": "its_not_a_ddos", + "translation": "They were deactivated, so it's not a DDoS attack like usual." + }, + { + "id": "future_not_looking_good", + "translation": "Future prospects for nyaa are not looking good. (It's dead)" + }, + { + "id": "recovery_effort", + "translation": "There is a recovery effort taking place." + }, + { + "id": "is_everything_lost", + "translation": "Is everything lost?" + }, + { + "id": "in_short_no", + "translation": "In short, No." + }, + { + "id": "are_some_things_lost", + "translation": "Are some things lost?" + }, + { + "id": "answer_is_nyaa_db_lost", + "translation": "We have a database of the torrents on nyaa up to April 5 May 1. That means almost nothing is lost." + }, + { + "id": "answer_is_sukebei_db_lost", + "translation": "Sukebei, however might be in worse shape. Currently we only have sukebei databases up to 2016, but a newer database might be available for use." + }, + { + "id": "how_are_we_recovering", + "translation": "How are we recovering?" + }, + { + "id": "answer_how_are_we_recovering", + "translation": "The aforementioned databases are being hosted at nyaa.pantsu.cat and sukebei.pantsu.cat. There is a search function, and (almost) full nyaa functionality should be coming soon. Seeder/leecher statistics are possible via scraping and might be restored sometime in the future, since other feature take priority right now." + }, + { + "id": "are_the_trackers_working", + "translation": "Are the torrents still working?" + }, + { + "id": "answer_are_the_trackers_working", + "translation": "Even if the trackers are down, seeders are still connected to the decentralized DHT network. As long as the file is listed on the DHT network, business should carry on as usual." + }, + { + "id": "how_do_i_download_the_torrents", + "translation": "How do I download the torrents?" + }, + { + "id": "answer_how_do_i_download_the_torrents", + "translation": "Just use the magnet link. The magnet link will be used by your BitTorrent client to look up the file on the DHT network and it should download just fine." + }, + { + "id": "magnet_link_should_look_like", + "translation": "The magnet link should look like this:" + }, + { + "id": "which_trackers_do_you_recommend", + "translation": "Which trackers do you recommend using?" + }, + { + "id": "answer_which_trackers_do_you_recommend", + "translation": "If your torrent upload is denied because of trackers you'll need to add some of these:" + }, + { + "id": "how_can_i_help", + "translation": "How can I help?" + }, + { + "id": "answer_how_can_i_help", + "translation": "If you have website development expertise, you can join the #nyaapantsu IRC channel on irc.rizon.net. If you have any current databases, especially for sukebei, UPLOAD THEM." + }, + { + "id": "your_design_sucks_found_a_bug", + "translation": "Your design sucks / I found a bug" + }, + { + "id": "why_written_in_go", + "translation": "Why is your shit written in Go?" + }, + { + "id": "authors_favorite_language", + "translation": "It's the author's favorite programming language." + }, + { + "id": "nyaa_pantsu_dont_host_files", + "translation": "nyaa.pantsu.cat and sukebei.pantsu.cat do not host any files." + }, + { + "id": "upload_magnet", + "translation": "Upload magnet" + }, + { + "id": "torrent_file", + "translation": "Torrent file" + }, + { + "id": "uploading_file_prefills_fields", + "translation": "Uploading a torrent file allows pre-filling some fields, this is recommended." + }, + { + "id": "magnet_link", + "translation": "Magnet Link" + }, + { + "id": "all_categories", + "translation": "All categories" + }, + { + "id": "anime", + "translation": "Anime" + }, + { + "id": "anime_amv", + "translation": "Anime - Anime Music Video" + }, + { + "id": "anime_english_translated", + "translation": "Anime - English-translated" + }, + { + "id": "anime_non_english_translated", + "translation": "Anime - Non-English-translated" + }, + { + "id": "anime_raw", + "translation": "Anime - Raw" + }, + { + "id": "audio", + "translation": "Audio" + }, + { + "id": "audio_lossless", + "translation": "Audio - Lossless" + }, + { + "id": "audio_lossy", + "translation": "Audio - Lossy" + }, + { + "id": "literature", + "translation": "Literature" + }, + { + "id": "literature_english_translated", + "translation": "Literature - English-translated" + }, + { + "id": "literature_raw", + "translation": "Literature - Raw" + }, + { + "id": "literature_non_english_translated", + "translation": "Literature - Non-English-translated" + }, + { + "id": "live_action", + "translation": "Live Action" + }, + { + "id": "live_action_english_translated", + "translation": "Live Action - English-translated" + }, + { + "id": "live_action_idol_pv", + "translation": "Live Action - Idol/Promotional Video" + }, + { + "id": "live_action_non_english_translated", + "translation": "Live Action - Non-English-translated" + }, + { + "id": "live_action_raw", + "translation": "Live Action - Raw" + }, + { + "id": "pictures", + "translation": "Pictures" + }, + { + "id": "pictures_graphics", + "translation": "Pictures - Graphics" + }, + { + "id": "pictures_photos", + "translation": "Pictures - Photos" + }, + { + "id": "software", + "translation": "Software" + }, + { + "id": "software_applications", + "translation": "Software - Applications" + }, + { + "id": "software_games", + "translation": "Software - Games" + }, + { + "id": "torrent_description", + "translation": "Torrent Description" + }, + { + "id": "description_markdown_notice", + "translation": "Markdown can be used in descriptions." + }, + { + "id": "show_all", + "translation": "Show all" + }, + { + "id": "filter_remakes", + "translation": "Filter Remakes" + }, + { + "id": "trusted", + "translation": "Trusted" + }, + { + "id": "id", + "translation": "ID" + }, + { + "id": "downloads", + "translation": "Downloads" + }, + { + "id": "descending", + "translation": "Descending" + }, + { + "id": "ascending", + "translation": "Ascending" + }, + { + "id": "search", + "translation": "Search" + }, + { + "id": "hash", + "translation": "Hash" + }, + { + "id": "description", + "translation": "Description" + }, + { + "id": "comments", + "translation": "Comments" + }, + { + "id": "submit_a_comment_as_username", + "translation": "Submit a comment as %s" + }, + { + "id": "submit_a_comment_as_anonymous", + "translation": "Submit a comment as Anonymous" + }, + { + "id": "submit", + "translation": "Submit" + }, + { + "id": "personal_info", + "translation": "Personal Info" + }, + { + "id": "language", + "translation": "Language" + }, + { + "id": "current_password", + "translation": "Current password" + }, + { + "id": "role", + "translation": "Role" + }, + { + "id": "banned", + "translation": "Banned" + }, + { + "id": "default", + "translation": "Default" + }, + { + "id": "trusted_member", + "translation": "Trusted member" + }, + { + "id": "moderator", + "translation": "Moderator" + }, + { + "id": "save_changes", + "translation": "Save Changes" + }, + { + "id": "profile_updated", + "translation": "Your profile has been correctly updated!" + }, + { + "id": "delete_account", + "translation": "Delete Account" + }, + { + "id": "delete_account_confirm", + "translation": "Are you sure you want to delete this account?" + }, + { + "id": "delete_success", + "translation": "The account has been successfully deleted!" + } +] From 32d0115d62a9fa4665000822a3f22362ab7dce05 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 13:52:13 +0200 Subject: [PATCH 03/20] Initial Translation (uncomplete) --- translations/it-it.all.json | 98 ++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index ebdaa34d..f6441b69 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -5,7 +5,7 @@ }, { "id": "verify_email_title", - "translation": "Verify your email address for Nyaapantsu." + "translation": "Verifica il tuo indirizzo email per Nyaapantsu." }, { "id": "verify_email_content", @@ -33,11 +33,11 @@ }, { "id":"email_address_or_username", - "translation": "Email Address or Username" + "translation": "Indirizzo Email o Username" }, { "id":"email_address", - "translation": "Email Address" + "translation": "Indirizzo Email" }, { "id":"password", @@ -45,11 +45,11 @@ }, { "id":"confirm_password", - "translation": "Confirm Password" + "translation": "Conferma Password" }, { "id":"i_agree", - "translation": "I agree" + "translation": "Accetto" }, { "id":"terms_conditions_confirm", @@ -61,7 +61,7 @@ }, { "id":"register", - "translation": "Register" + "translation": "Registrati" }, { "id":"terms_conditions", @@ -77,7 +77,7 @@ }, { "id":"forgot_password", - "translation": "Forgot Password?" + "translation": "Dimenticato la password?" }, { "id":"sign_in_box_title", @@ -93,7 +93,7 @@ }, { "id":"sign_up_success", - "translation": "Thank you for registering!" + "translation": "Grazie per esserti registrato" }, { "id":"verify_success", @@ -109,7 +109,7 @@ }, { "id":"settings", - "translation": "Account Settings" + "translation": "Settaggi Account" }, { "id":"torrents", @@ -117,7 +117,7 @@ }, { "id":"follow", - "translation": "Follow" + "translation": "Segui" }, { "id":"unfollow", @@ -133,7 +133,7 @@ }, { "id":"profile_page", - "translation": "%s Profile Page" + "translation": "%s Pagina Profilo" }, { "id":"see_more_torrents_from", @@ -141,19 +141,19 @@ }, { "id":"category", - "translation": "Category" + "translation": "Categoria" }, { "id": "name", - "translation": "Name" + "translation": "Nome" }, { "id": "date", - "translation": "Date" + "translation": "Data" }, { "id": "size", - "translation": "Size" + "translation": "Dimensione" }, { "id": "links", @@ -165,7 +165,7 @@ }, { "id": "error_404", - "translation": "Error 404" + "translation": "Errore 404" }, { "id": "toggle_navigation", @@ -173,7 +173,7 @@ }, { "id": "upload", - "translation": "Upload" + "translation": "Carica" }, { "id": "faq", @@ -193,7 +193,7 @@ }, { "id": "404_not_found", - "translation": "404 Not Found" + "translation": "404 Non Trovato" }, { "id": "no_torrents_uploaded", @@ -201,7 +201,7 @@ }, { "id": "profile", - "translation": "Profile" + "translation": "Profilo" }, { "id": "sign_out", @@ -209,7 +209,7 @@ }, { "id": "member", - "translation": "Member" + "translation": "Membro" }, { "id": "sign_in", @@ -221,7 +221,7 @@ }, { "id": "no_results_found", - "translation": "No Results found" + "translation": "Nessun risultato trovato" }, { "id": "notice_keep_seeding", @@ -237,11 +237,11 @@ }, { "id": "what_happened", - "translation": "What happened?" + "translation": "Cosa è successo?" }, { "id": "nyaa_se_went_offline", - "translation": "nyaa.se and associated domains (such as nyaatorrents.info) went offline on May 01, 2017." + "translation": "nyaa.se e i domini associati (come nyaatorrents.info) sono andati offline il 1° Maggio, 2017." }, { "id": "its_not_a_ddos", @@ -285,7 +285,7 @@ }, { "id": "are_the_trackers_working", - "translation": "Are the torrents still working?" + "translation": "I torrent funzionano ancora?" }, { "id": "answer_are_the_trackers_working", @@ -313,7 +313,7 @@ }, { "id": "how_can_i_help", - "translation": "How can I help?" + "translation": "Come posso aiutare?" }, { "id": "answer_how_can_i_help", @@ -321,7 +321,7 @@ }, { "id": "your_design_sucks_found_a_bug", - "translation": "Your design sucks / I found a bug" + "translation": "Il tuo design fa cagare / Ho trovato un bug" }, { "id": "why_written_in_go", @@ -337,11 +337,11 @@ }, { "id": "upload_magnet", - "translation": "Upload magnet" + "translation": "Carica magnet" }, { "id": "torrent_file", - "translation": "Torrent file" + "translation": "File Torrent" }, { "id": "uploading_file_prefills_fields", @@ -353,7 +353,7 @@ }, { "id": "all_categories", - "translation": "All categories" + "translation": "Tutte le categorie" }, { "id": "anime", @@ -389,19 +389,19 @@ }, { "id": "literature", - "translation": "Literature" + "translation": "Letteratura" }, { "id": "literature_english_translated", - "translation": "Literature - English-translated" + "translation": "Letteratura - Tradotta in Inglese" }, { "id": "literature_raw", - "translation": "Literature - Raw" + "translation": "Letteratura - Raw" }, { "id": "literature_non_english_translated", - "translation": "Literature - Non-English-translated" + "translation": "Letteratura - Tradotta in altre lingue" }, { "id": "live_action", @@ -441,11 +441,11 @@ }, { "id": "software_applications", - "translation": "Software - Applications" + "translation": "Software - Applicazioni" }, { "id": "software_games", - "translation": "Software - Games" + "translation": "Software - Giochi" }, { "id": "torrent_description", @@ -457,7 +457,7 @@ }, { "id": "show_all", - "translation": "Show all" + "translation": "Mostra Tutto" }, { "id": "filter_remakes", @@ -485,7 +485,7 @@ }, { "id": "search", - "translation": "Search" + "translation": "Ricerca" }, { "id": "hash", @@ -513,23 +513,23 @@ }, { "id": "personal_info", - "translation": "Personal Info" + "translation": "Informazioni Personali" }, { "id": "language", - "translation": "Language" + "translation": "Linguaggio" }, { "id": "current_password", - "translation": "Current password" + "translation": "Password Attuale" }, { "id": "role", - "translation": "Role" + "translation": "Ruolo" }, { "id": "banned", - "translation": "Banned" + "translation": "Bannato" }, { "id": "default", @@ -537,30 +537,30 @@ }, { "id": "trusted_member", - "translation": "Trusted member" + "translation": "Membro Fidato" }, { "id": "moderator", - "translation": "Moderator" + "translation": "Moderatore" }, { "id": "save_changes", - "translation": "Save Changes" + "translation": "Salva Cambiamenti" }, { "id": "profile_updated", - "translation": "Your profile has been correctly updated!" + "translation": "Il tuo profilo è stato aggiornato correttamente!" }, { "id": "delete_account", - "translation": "Delete Account" + "translation": "Cancella Account" }, { "id": "delete_account_confirm", - "translation": "Are you sure you want to delete this account?" + "translation": "Sei sicuro di voler cancellare questo account?" }, { "id": "delete_success", - "translation": "The account has been successfully deleted!" + "translation": "L'account è stato cancellato con successo!" } ] From 09049aa191c3ed883d57e6f386c5fcc6a9745e0a Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 14:28:58 +0200 Subject: [PATCH 04/20] More stuff translated. --- translations/it-it.all.json | 112 ++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index f6441b69..eb12814b 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -17,11 +17,11 @@ }, { "id": "reset_password_content", - "translation": "Please click below link to reset your password." + "translation": "Clicca qui per resettare la tua password." }, { "id":"register_title", - "translation": "Creating a new account" + "translation": "Creazione di un nuovo account" }, { "id":"signup_box_title", @@ -57,7 +57,7 @@ }, { "id":"signin", - "translation": "Sign In" + "translation": "Logga" }, { "id":"register", @@ -65,15 +65,15 @@ }, { "id":"terms_conditions", - "translation": "Terms and Conditions" + "translation": "Termini e condizioni" }, { "id":"terms_conditions_full", - "translation": "Some Shit." + "translation": "Stronzate varie." }, { "id":"remember_me", - "translation": "Remember me" + "translation": "Ricordami" }, { "id":"forgot_password", @@ -81,15 +81,15 @@ }, { "id":"sign_in_box_title", - "translation": "Please Sign In" + "translation": "Per Favore Entra" }, { "id":"sign_in_title", - "translation": "Sign In" + "translation": "Entra" }, { "id":"register_success_title", - "translation": "Sign Up Successful" + "translation": "Registrato con Successo!" }, { "id":"sign_up_success", @@ -101,7 +101,7 @@ }, { "id":"signup_verification_email", - "translation": "Finally, please check your mail inbox (and spam folder!) for the verification email." + "translation": "Finally, per favore controlla la tua casella email (e la cartella spam!) per l'email di verifica." }, { "id":"signup_verification_noemail", @@ -185,11 +185,11 @@ }, { "id": "advanced_search", - "translation": "Advanced Search" + "translation": "Ricerca Avanzata" }, { "id": "nothing_here", - "translation": "Nothing Here." + "translation": "Non c'è nulla qui." }, { "id": "404_not_found", @@ -197,7 +197,7 @@ }, { "id": "no_torrents_uploaded", - "translation": "No torrents uploaded yet!" + "translation": "Nessun torrent caricato per ora!" }, { "id": "profile", @@ -205,7 +205,7 @@ }, { "id": "sign_out", - "translation": "Sign-out" + "translation": "Esci" }, { "id": "member", @@ -213,11 +213,11 @@ }, { "id": "sign_in", - "translation": "Sign In" + "translation": "Entra" }, { "id": "sign_up", - "translation": "Sign Up" + "translation": "Registrati" }, { "id": "no_results_found", @@ -225,15 +225,15 @@ }, { "id": "notice_keep_seeding", - "translation": "NOTICE: KEEP SEEDING AND ENABLE DHT YOU RETARD" + "translation": "ATTENZIONE: CONTINUA A SEEDARE I TORRENT E ABILITA IL DHT RITARDATO" }, { "id": "official_nyaapocalipse_faq", - "translation": "Official Nyaapocalypse FAQ" + "translation": "FAQ Ufficiale della Nyaapocalypse" }, { "id": "links_replacement_mirror", - "translation": "Links for the replacement/mirror" + "translation": "Collegamenti di sostituzione/mirror" }, { "id": "what_happened", @@ -245,31 +245,31 @@ }, { "id": "its_not_a_ddos", - "translation": "They were deactivated, so it's not a DDoS attack like usual." + "translation": "Sono stati terminati, quindi non è un attacco DDoS come al solito." }, { "id": "future_not_looking_good", - "translation": "Future prospects for nyaa are not looking good. (It's dead)" + "translation": "Le prospettive future per nyaa non sembrano buone. (È morto)" }, { "id": "recovery_effort", - "translation": "There is a recovery effort taking place." + "translation": "Sta avvenendo uno sforzo di recupero." }, { "id": "is_everything_lost", - "translation": "Is everything lost?" + "translation": "È andato perso tutto?" }, { "id": "in_short_no", - "translation": "In short, No." + "translation": "In parole povere, No." }, { "id": "are_some_things_lost", - "translation": "Are some things lost?" + "translation": "È andato perso qualcosa?" }, { "id": "answer_is_nyaa_db_lost", - "translation": "We have a database of the torrents on nyaa up to April 5 May 1. That means almost nothing is lost." + "translation": "Abbiamo un database dei torrent di nyaa fino al April 5 May 1. Questo vuol dire che quasi niente è andato perduto." }, { "id": "answer_is_sukebei_db_lost", @@ -277,7 +277,7 @@ }, { "id": "how_are_we_recovering", - "translation": "How are we recovering?" + "translation": "Come va il recupero?" }, { "id": "answer_how_are_we_recovering", @@ -289,11 +289,11 @@ }, { "id": "answer_are_the_trackers_working", - "translation": "Even if the trackers are down, seeders are still connected to the decentralized DHT network. As long as the file is listed on the DHT network, business should carry on as usual." + "translation": "Anche se i trackers sono offline, seeders are still connected to the decentralized DHT network. As long as the file is listed on the DHT network, business should carry on as usual." }, { "id": "how_do_i_download_the_torrents", - "translation": "How do I download the torrents?" + "translation": "Come posso scaricare i torrent?" }, { "id": "answer_how_do_i_download_the_torrents", @@ -301,11 +301,11 @@ }, { "id": "magnet_link_should_look_like", - "translation": "The magnet link should look like this:" + "translation": "Il magnet link dovrebbe sembrare così:" }, { "id": "which_trackers_do_you_recommend", - "translation": "Which trackers do you recommend using?" + "translation": "Quali trackers consigli di utilizzare?" }, { "id": "answer_which_trackers_do_you_recommend", @@ -317,7 +317,7 @@ }, { "id": "answer_how_can_i_help", - "translation": "If you have website development expertise, you can join the #nyaapantsu IRC channel on irc.rizon.net. If you have any current databases, especially for sukebei, UPLOAD THEM." + "translation": "Se hai esperienza nel web design, vieni sul canale IRC #nyaapantsu su irc.rizon.net. Se hai dei database aggiornati, specialmente per sukebei, CARICALI!." }, { "id": "your_design_sucks_found_a_bug", @@ -325,15 +325,15 @@ }, { "id": "why_written_in_go", - "translation": "Why is your shit written in Go?" + "translation": "Perchè questo schifo è scritto in Go?" }, { "id": "authors_favorite_language", - "translation": "It's the author's favorite programming language." + "translation": "È il linguaggio di programmazione preferito dell'autore." }, { "id": "nyaa_pantsu_dont_host_files", - "translation": "nyaa.pantsu.cat and sukebei.pantsu.cat do not host any files." + "translation": "nyaa.pantsu.cat e sukebei.pantsu.cat non contengono/hostano nessun file al loro interno." }, { "id": "upload_magnet", @@ -345,7 +345,7 @@ }, { "id": "uploading_file_prefills_fields", - "translation": "Uploading a torrent file allows pre-filling some fields, this is recommended." + "translation": "Caricare un file torrent permette di auto-riempire alcuni campi, è raccomandato farlo." }, { "id": "magnet_link", @@ -365,11 +365,11 @@ }, { "id": "anime_english_translated", - "translation": "Anime - English-translated" + "translation": "Anime - Tradotti in Inglese }, { "id": "anime_non_english_translated", - "translation": "Anime - Non-English-translated" + "translation": "Anime - Tradotti in altre lingue" }, { "id": "anime_raw", @@ -393,7 +393,7 @@ }, { "id": "literature_english_translated", - "translation": "Letteratura - Tradotta in Inglese" + "translation": "Letteratura - Tradotti in Inglese" }, { "id": "literature_raw", @@ -401,7 +401,7 @@ }, { "id": "literature_non_english_translated", - "translation": "Letteratura - Tradotta in altre lingue" + "translation": "Letteratura - Tradotti in altre lingue" }, { "id": "live_action", @@ -409,15 +409,15 @@ }, { "id": "live_action_english_translated", - "translation": "Live Action - English-translated" + "translation": "Live Action - Tradotti in Inglese" }, { "id": "live_action_idol_pv", - "translation": "Live Action - Idol/Promotional Video" + "translation": "Live Action - Idol/Video Promozionali" }, { "id": "live_action_non_english_translated", - "translation": "Live Action - Non-English-translated" + "translation": "Live Action - Tradotti in altre lingue" }, { "id": "live_action_raw", @@ -425,15 +425,15 @@ }, { "id": "pictures", - "translation": "Pictures" + "translation": "Immagini" }, { "id": "pictures_graphics", - "translation": "Pictures - Graphics" + "translation": "Immagini - Grafico" }, { "id": "pictures_photos", - "translation": "Pictures - Photos" + "translation": "Immagini - Fotografia" }, { "id": "software", @@ -449,11 +449,11 @@ }, { "id": "torrent_description", - "translation": "Torrent Description" + "translation": "Descrizione Torrent" }, { "id": "description_markdown_notice", - "translation": "Markdown can be used in descriptions." + "translation": "Markdown può essere usato nelle descrizioni." }, { "id": "show_all", @@ -465,7 +465,7 @@ }, { "id": "trusted", - "translation": "Trusted" + "translation": "Fidato" }, { "id": "id", @@ -477,11 +477,11 @@ }, { "id": "descending", - "translation": "Descending" + "translation": "Discendente" }, { "id": "ascending", - "translation": "Ascending" + "translation": "Ascendente" }, { "id": "search", @@ -493,23 +493,23 @@ }, { "id": "description", - "translation": "Description" + "translation": "Descrizione" }, { "id": "comments", - "translation": "Comments" + "translation": "Commenti" }, { "id": "submit_a_comment_as_username", - "translation": "Submit a comment as %s" + "translation": "Invia un commento come %s" }, { "id": "submit_a_comment_as_anonymous", - "translation": "Submit a comment as Anonymous" + "translation": "Invia un commento come Anonimo" }, { "id": "submit", - "translation": "Submit" + "translation": "Invia" }, { "id": "personal_info", From 7203641450182e77ccad3341cdf4d343d6c41919 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 14:29:59 +0200 Subject: [PATCH 05/20] Correction. --- translations/it-it.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index eb12814b..79652f33 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -365,7 +365,7 @@ }, { "id": "anime_english_translated", - "translation": "Anime - Tradotti in Inglese + "translation": "Anime - Tradotti in Inglese" }, { "id": "anime_non_english_translated", From 06b5a082f3d2d716b2d2693f87c586e9b51f6332 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 15:07:46 +0200 Subject: [PATCH 06/20] Almost finished. --- translations/it-it.all.json | 44 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index 79652f33..de880c02 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -13,7 +13,7 @@ }, { "id": "reset_password_title", - "translation": "Reset your password for goyangi." + "translation": "Resetta la tua password per Nyaapantsu." }, { "id": "reset_password_content", @@ -25,11 +25,11 @@ }, { "id":"signup_box_title", - "translation": "Please Sign Up It's free and always will be." + "translation": "Iscriviti È gratuito e lo sara per sempre." }, { "id":"username", - "translation": "Username" + "translation": "Nome Utente" }, { "id":"email_address_or_username", @@ -53,11 +53,11 @@ }, { "id":"terms_conditions_confirm", - "translation": "By clicking Register, you agree to the Terms and Conditions set out by this site, including our Cookie Use." + "translation": "Cliccando Register, accetti i Termini e le condizioni stabilite da questo sito, incluso il nostro Utilizzo dei Cookie." }, { "id":"signin", - "translation": "Logga" + "translation": "Entra" }, { "id":"register", @@ -97,15 +97,15 @@ }, { "id":"verify_success", - "translation": "Your account is now activated!" + "translation": "Il tuo account è ora attivo!" }, { "id":"signup_verification_email", - "translation": "Finally, per favore controlla la tua casella email (e la cartella spam!) per l'email di verifica." + "translation": "Per concludere, controlla la tua casella email (e la cartella spam!) per l'email di verifica." }, { "id":"signup_verification_noemail", - "translation": "Registration was successful, you may now use your account." + "translation": "La registrazione è avvenuta con successo, adesso puoi usare il tuo account." }, { "id":"settings", @@ -121,23 +121,23 @@ }, { "id":"unfollow", - "translation": "Unfollow" + "translation": "Smetti di seguire" }, { "id":"user_followed_msg", - "translation": "You have followed %s!" + "translation": "Hai seguito %s!" }, { "id":"user_unfollowed_msg", - "translation": "You have unfollowed %s!" + "translation": "Hai smesso di seguire %s!" }, { "id":"profile_page", - "translation": "%s Pagina Profilo" + "translation": "Pagina Profilo di %s" }, { "id":"see_more_torrents_from", - "translation": "See more torrents from %s " + "translation": "Guarda altri torrent di %s " }, { "id":"category", @@ -157,7 +157,7 @@ }, { "id": "links", - "translation": "Links" + "translation": "Collegamenti" }, { "id": "home", @@ -257,7 +257,7 @@ }, { "id": "is_everything_lost", - "translation": "È andato perso tutto?" + "translation": "È andato tutto perso?" }, { "id": "in_short_no", @@ -269,11 +269,11 @@ }, { "id": "answer_is_nyaa_db_lost", - "translation": "Abbiamo un database dei torrent di nyaa fino al April 5 May 1. Questo vuol dire che quasi niente è andato perduto." + "translation": "Abbiamo un database dei torrent di nyaa fino al 5 Aprile/s> 1° Maggio. Questo vuol dire che quasi niente è andato perduto." }, { "id": "answer_is_sukebei_db_lost", - "translation": "Sukebei, however might be in worse shape. Currently we only have sukebei databases up to 2016, but a newer database might be available for use." + "translation": "Sukebei può essere effettivamente in condizioni peggiori. Attualmente abbiamo i database di sukebei solo fino al 2016, ma un nuovo database potrebbe diventare disponible." }, { "id": "how_are_we_recovering", @@ -281,7 +281,7 @@ }, { "id": "answer_how_are_we_recovering", - "translation": "The aforementioned databases are being hosted at nyaa.pantsu.cat and sukebei.pantsu.cat. There is a search function, and (almost) full nyaa functionality should be coming soon. Seeder/leecher statistics are possible via scraping and might be restored sometime in the future, since other feature take priority right now." + "translation": "I database citati sono attualmente hostati su nyaa.pantsu.cat e sukebei.pantsu.cat. C'è una funzione di ricerca, e (almost) full nyaa functionality dovrebbe arrivare presto. Le statistiche dei Seeder/leecher sono possibili attraverso scraping e potrebbero essere ripristinate in futuro, visto che altre funzionalità hanno la precedenza adesso." }, { "id": "are_the_trackers_working", @@ -289,7 +289,7 @@ }, { "id": "answer_are_the_trackers_working", - "translation": "Anche se i trackers sono offline, seeders are still connected to the decentralized DHT network. As long as the file is listed on the DHT network, business should carry on as usual." + "translation": "Anche se i trackers sono offline, i seeders sono ancora connessi alla rete decentralizzata DHT . Finchè il file è presente sulla rete DHT, tutto funzionerà come al solito." }, { "id": "how_do_i_download_the_torrents", @@ -297,7 +297,7 @@ }, { "id": "answer_how_do_i_download_the_torrents", - "translation": "Just use the magnet link. The magnet link will be used by your BitTorrent client to look up the file on the DHT network and it should download just fine." + "translation": "Semplicemente, usa il magnet link. Il magnet link sarà utilizzato dal tuo client Bittorrent per trovare il file sulla rete DHT e dovrebbe scaricarlo normalmente." }, { "id": "magnet_link_should_look_like", @@ -309,7 +309,7 @@ }, { "id": "answer_which_trackers_do_you_recommend", - "translation": "If your torrent upload is denied because of trackers you'll need to add some of these:" + "translation": "Se il caricamente del tuo torrent è negato a causa dei trackers, dovrai aggiungere alcuni di questi:" }, { "id": "how_can_i_help", @@ -429,7 +429,7 @@ }, { "id": "pictures_graphics", - "translation": "Immagini - Grafico" + "translation": "Immagini - Grafica" }, { "id": "pictures_photos", From 2a1d628bd19b9a47f2a2c60a3fcba45b85d2f5d1 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 15:09:40 +0200 Subject: [PATCH 07/20] Quasi finito-parte 2. --- translations/it-it.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index de880c02..6c3ba0e8 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -9,7 +9,7 @@ }, { "id": "verify_email_content", - "translation": "Please click below link to verify your email." + "translation": "Per favore, clicca il link qua sotto per verificare la tua email." }, { "id": "reset_password_title", From 99d1819192503c0057ad815bd100c6a6a6ca6560 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 15:24:04 +0200 Subject: [PATCH 08/20] Finished. --- translations/it-it.all.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index 6c3ba0e8..3958f4ad 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -33,7 +33,7 @@ }, { "id":"email_address_or_username", - "translation": "Indirizzo Email o Username" + "translation": "Indirizzo Email o Nome Utente" }, { "id":"email_address", @@ -169,7 +169,7 @@ }, { "id": "toggle_navigation", - "translation": "Toggle navigation" + "translation": "Alterna la navigazione" }, { "id": "upload", @@ -461,7 +461,7 @@ }, { "id": "filter_remakes", - "translation": "Filter Remakes" + "translation": "Filtra Remakes" }, { "id": "trusted", From 64d4dee9457d76eff0308413a21b70d09a8babc1 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 15:33:15 +0200 Subject: [PATCH 09/20] Added missing translation --- translations/it-it.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index 3958f4ad..a00317c8 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -53,7 +53,7 @@ }, { "id":"terms_conditions_confirm", - "translation": "Cliccando Register, accetti i Termini e le condizioni stabilite da questo sito, incluso il nostro Utilizzo dei Cookie." + "translation": "Cliccando Registrati, accetti i Termini e le condizioni stabilite da questo sito, incluso il nostro Utilizzo dei Cookie." }, { "id":"signin", From 5d83bcec801202e3f42ce47a96346f88ff31f4f8 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 20:30:47 +0200 Subject: [PATCH 10/20] Fixed typo. --- translations/it-it.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index a00317c8..f9a3e9ef 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -25,7 +25,7 @@ }, { "id":"signup_box_title", - "translation": "Iscriviti È gratuito e lo sara per sempre." + "translation": "Iscriviti È gratuito e lo sarà per sempre." }, { "id":"username", From 3e05a4d1fb3a382fc6b5c39fafbffdbb79e69e19 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 20:53:14 +0200 Subject: [PATCH 11/20] Update it-it.all.json --- translations/it-it.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index f9a3e9ef..a00317c8 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -25,7 +25,7 @@ }, { "id":"signup_box_title", - "translation": "Iscriviti È gratuito e lo sarà per sempre." + "translation": "Iscriviti È gratuito e lo sara per sempre." }, { "id":"username", From 730d9817bf4401b0110efa3136f8bfc3bdd448c1 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 21:14:31 +0200 Subject: [PATCH 12/20] Fixed minor typo. --- translations/it-it.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index a00317c8..f9a3e9ef 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -25,7 +25,7 @@ }, { "id":"signup_box_title", - "translation": "Iscriviti È gratuito e lo sara per sempre." + "translation": "Iscriviti È gratuito e lo sarà per sempre." }, { "id":"username", From 38f844ec3af1048142d196aaaf8d7e84f17530ae Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 21:30:14 +0200 Subject: [PATCH 13/20] Added the missing < --- translations/it-it.all.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index f9a3e9ef..787ab652 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -269,7 +269,7 @@ }, { "id": "answer_is_nyaa_db_lost", - "translation": "Abbiamo un database dei torrent di nyaa fino al 5 Aprile/s> 1° Maggio. Questo vuol dire che quasi niente è andato perduto." + "translation": "Abbiamo un database dei torrent di nyaa fino al 5 Aprile 1° Maggio. Questo vuol dire che quasi niente è andato perduto." }, { "id": "answer_is_sukebei_db_lost", From 60bfc33beac5837552ab86e284d7ffe1d0a42330 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Wed, 10 May 2017 22:40:53 +0200 Subject: [PATCH 14/20] Updated translaton. --- translations/it-it.all.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index 787ab652..87a1a0b1 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -562,5 +562,21 @@ { "id": "delete_success", "translation": "L'account è stato cancellato con successo!" - } + }, + { + "id": "moderation", + "translation": "Moderazione" + }, + { + "id": "who_is_renchon", + "translation": "Chi cazzo è れんちょん?" + }, + { + "id": "renchon_anon_explanation", + "translation": "れんちょん è il nome utente assegnato per uploads e commenti anonimi. È anche utilizzato per i torrent importati dal nyaa originale, anche se l'uploader originale può essere mostrato di fianco." + }, + { + "id": "mark_as_remake", + "translation": "Segnala come remake" +} ] From 08c5bbedb0dfc32fa82a642a3a08760a2a773e38 Mon Sep 17 00:00:00 2001 From: Nutjob Date: Thu, 11 May 2017 11:11:47 +0200 Subject: [PATCH 15/20] Updated Translation --- translations/it-it.all.json | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/translations/it-it.all.json b/translations/it-it.all.json index 87a1a0b1..40232b8f 100644 --- a/translations/it-it.all.json +++ b/translations/it-it.all.json @@ -578,5 +578,29 @@ { "id": "mark_as_remake", "translation": "Segnala come remake" -} +}, + { + "id": "email_changed", + "translation": "Email cambiata con successo! Dovrai, tuttavia, per confermare cliccare il link mandato a: %s" + }, + { + "id": "torrent_status", + "translation": "Torrent status" + }, + { + "id": "torrent_status_hidden", + "translation": "Nascosto" + }, + { + "id": "torrent_status_normal", + "translation": "Normale" + }, + { + "id": "torrent_status_remake", + "translation": "Remake" + }, + { + "id": "profile_edit_page", + "translation": "Modifica il profilo di %s" + } ] From 1485078e1ec6d72f574a9a0fb723ed208a270945 Mon Sep 17 00:00:00 2001 From: Mark Winter Date: Thu, 11 May 2017 10:30:38 +0100 Subject: [PATCH 16/20] Update Korean translations --- translations/ko-kr.all.json | 42 ++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/translations/ko-kr.all.json b/translations/ko-kr.all.json index 37abe729..df3a1082 100644 --- a/translations/ko-kr.all.json +++ b/translations/ko-kr.all.json @@ -49,7 +49,7 @@ }, { "id":"i_agree", - "translation": "동의합니다" + "translation": "동의" }, { "id":"terms_conditions_confirm", @@ -65,11 +65,11 @@ }, { "id":"terms_conditions", - "translation": "약관" + "translation": "이용약관" }, { "id":"terms_conditions_full", - "translation": "블라블라" + "translation": "ㅅㅂ" }, { "id":"remember_me", @@ -115,6 +115,10 @@ "id":"follow", "translation": "팔로우" }, + { + "id":"unfollow", + "translation": "언팔로우" + }, { "id":"profile_page", "translation": "%s 프로필 페이지" @@ -165,7 +169,7 @@ }, { "id": "fap", - "translation": "딸" + "translation": "자위" }, { "id": "advanced_search", @@ -201,11 +205,11 @@ }, { "id": "sign_up", - "translation": "가입" + "translation": "회원가입" }, { "id": "no_results_found", - "translation": "결과 없음" + "translation": "검색결과가 없습니다" }, { "id": "notice_keep_seeding", @@ -221,7 +225,7 @@ }, { "id": "what_happened", - "translation": "무슨 일이 있었던거야?" + "translation": "무슨 일입니까?" }, { "id": "nyaa_se_went_offline", @@ -341,23 +345,23 @@ }, { "id": "anime", - "translation": "Anime" + "translation": "애니" }, { "id": "anime_amv", - "translation": "Anime - 애니메이션 뮤직 비디오" + "translation": "애니 - 애니메이션 뮤직 비디오" }, { "id": "anime_english_translated", - "translation": "Anime - 영문 번역" + "translation": "애니 - 영문 번역" }, { "id": "anime_non_english_translated", - "translation": "Anime - 비-영문 번역" + "translation": "애니 - 비-영문 번역" }, { "id": "anime_raw", - "translation": "Anime - Raw" + "translation": "애니 - Raw" }, { "id": "audio", @@ -409,27 +413,27 @@ }, { "id": "pictures", - "translation": "Pictures" + "translation": "사진" }, { "id": "pictures_graphics", - "translation": "Pictures - 그래픽" + "translation": "사진 - 그래픽" }, { "id": "pictures_photos", - "translation": "Pictures - 사진" + "translation": "사진 - 사진" }, { "id": "software", - "translation": "Software" + "translation": "소프트웨어" }, { "id": "software_applications", - "translation": "Software - 응용프로그램" + "translation": "소프트웨어 - 응용프로그램" }, { "id": "software_games", - "translation": "Software - 게임" + "translation": "소프트웨어 - 게임" }, { "id": "torrent_description", @@ -453,7 +457,7 @@ }, { "id": "id", - "translation": "ID" + "translation": "아이디" }, { "id": "downloads", From 64622c36010c2e82e32be81305703d7933626693 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 11 May 2017 11:37:10 +0200 Subject: [PATCH 17/20] Make comment date display consistent with other date displays --- model/torrent.go | 9 +++++---- templates/view.html | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/model/torrent.go b/model/torrent.go index d3fca060..94cc27cd 100644 --- a/model/torrent.go +++ b/model/torrent.go @@ -85,7 +85,7 @@ type CommentJSON struct { Username string `json:"username"` UserID int `json:"user_id"` Content template.HTML `json:"content"` - Date time.Time `json:"date"` + Date string `json:"date"` } type TorrentJSON struct { @@ -117,10 +117,10 @@ func (t *Torrent) ToJSON() TorrentJSON { magnet := util.InfoHashToMagnet(strings.TrimSpace(t.Hash), t.Name, config.Trackers...) commentsJSON := make([]CommentJSON, 0, len(t.OldComments)+len(t.Comments)) for _, c := range t.OldComments { - commentsJSON = append(commentsJSON, CommentJSON{Username: c.Username, UserID: -1, Content: template.HTML(c.Content), Date: c.Date}) + commentsJSON = append(commentsJSON, CommentJSON{Username: c.Username, UserID: -1, Content: template.HTML(c.Content), Date: c.Date.Format(time.RFC3339)}) } for _, c := range t.Comments { - commentsJSON = append(commentsJSON, CommentJSON{Username: c.User.Username, UserID: int(c.User.ID), Content: util.MarkdownToHTML(c.Content), Date: c.CreatedAt}) + commentsJSON = append(commentsJSON, CommentJSON{Username: c.User.Username, UserID: int(c.User.ID), Content: util.MarkdownToHTML(c.Content), Date: c.CreatedAt.Format(time.RFC3339)}) } uploader := "" if t.Uploader != nil { @@ -130,7 +130,8 @@ func (t *Torrent) ToJSON() TorrentJSON { if t.ID <= config.LastOldTorrentID && len(config.TorrentCacheLink) > 0 { torrentlink = fmt.Sprintf(config.TorrentCacheLink, t.Hash) } else if t.ID > config.LastOldTorrentID && len(config.TorrentStorageLink) > 0 { - torrentlink = fmt.Sprintf(config.TorrentStorageLink, t.Hash) // TODO: Fix as part of configuration changes + // TODO: Fix as part of configuration changes (fix what?) + torrentlink = fmt.Sprintf(config.TorrentStorageLink, t.Hash) } res := TorrentJSON{ ID: strconv.FormatUint(uint64(t.ID), 10), diff --git a/templates/view.html b/templates/view.html index 6de44deb..cb4c01f5 100644 --- a/templates/view.html +++ b/templates/view.html @@ -93,8 +93,8 @@ {{.Username}} {{end}} -
- {{.Date.Year}}/{{.Date.Month}}/{{.Date.Day}} +
+ {{.Date}}
{{.Content}} From 9c9db7af0ddce5b462251d52c1c41474c317c21a Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 11 May 2017 11:45:13 +0200 Subject: [PATCH 18/20] Display comments date smaller --- public/css/style.css | 7 ++++++- templates/view.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index e66e1a65..db605fde 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -377,4 +377,9 @@ footer { position: relative; top: -0.5rem; float: right; -} \ No newline at end of file +} + +.comment-date { + font-size: smaller; + width: auto; /* Undo bootstrap's fixed width */ +} diff --git a/templates/view.html b/templates/view.html index cb4c01f5..be3cc185 100644 --- a/templates/view.html +++ b/templates/view.html @@ -93,7 +93,7 @@ {{.Username}} {{end}}
-
+
{{.Date}}
From 500f5bda02f21196e67b0cfe34dc28fc6f3b44cf Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 11 May 2017 11:58:44 +0200 Subject: [PATCH 19/20] Fix editing other profiles as a mod --- router/userHandler.go | 5 +++++ templates/_profile_edit.html | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/router/userHandler.go b/router/userHandler.go index e90ca472..e534edb4 100755 --- a/router/userHandler.go +++ b/router/userHandler.go @@ -157,6 +157,11 @@ func UserProfileFormHandler(w http.ResponseWriter, r *http.Request) { modelHelper.BindValueForm(&b, r) if !userPermission.HasAdmin(currentUser) { b.Username = currentUser.Username + b.Status = currentUser.Status + } else { + if b.Status == 2 { + err["errors"] = append(err["errors"], "Elevating status to moderator is prohibited") + } } err = modelHelper.ValidateForm(&b, err) if len(err) == 0 { diff --git a/templates/_profile_edit.html b/templates/_profile_edit.html index c5198f00..d549fd80 100644 --- a/templates/_profile_edit.html +++ b/templates/_profile_edit.html @@ -34,7 +34,7 @@ {{end}}
- {{ if not (HasAdmin .)}} + {{ if not (HasAdmin $.User)}}
@@ -63,7 +63,7 @@ {{end}}
- {{ if HasAdmin .}} + {{ if HasAdmin $.User}}

{{ T "moderation"}}

@@ -82,7 +82,7 @@ - +
{{ range (index $.FormErrors "status")}} From 09ff949945a8dcb4908ad01a677e9b462b5460d5 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Thu, 11 May 2017 12:01:52 +0200 Subject: [PATCH 20/20] Make account bans work --- service/user/cookieHelper.go | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/service/user/cookieHelper.go b/service/user/cookieHelper.go index cd32b7b6..b28e5a98 100644 --- a/service/user/cookieHelper.go +++ b/service/user/cookieHelper.go @@ -16,24 +16,6 @@ var cookieHandler = securecookie.New( securecookie.GenerateRandomKey(64), securecookie.GenerateRandomKey(32)) -// TODO: Figure out what this is about before I delete it -// // UserName get username from a cookie. -// func UserName(c *gin.Context) (string, error) { -// var userName string -// request := c.Request -// cookie, err := request.Cookie("session") -// if err != nil { -// return userName, err -// } -// cookieValue := make(map[string]string) -// err = cookieHandler.Decode("session", cookie.Value, &cookieValue) -// if err != nil { -// return userName, err -// } -// userName = cookieValue["name"] -// return userName, nil -// } - func Token(r *http.Request) (string, error) { var token string cookie, err := r.Cookie("session") @@ -90,17 +72,20 @@ func SetCookieHandler(w http.ResponseWriter, email string, pass string) (int, er if isValidEmail { log.Debug("User entered valid email.") if db.ORM.Where("email = ?", email).First(&user).RecordNotFound() { - return http.StatusNotFound, errors.New("user not found") + return http.StatusNotFound, errors.New("User not found") } } else { log.Debug("User entered username.") if db.ORM.Where("username = ?", email).First(&user).RecordNotFound() { - return http.StatusNotFound, errors.New("user not found") + return http.StatusNotFound, errors.New("User not found") } } err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(pass)) if err != nil { - return http.StatusUnauthorized, errors.New("password incorrect") + return http.StatusUnauthorized, errors.New("Password incorrect") + } + if user.Status == -1 { + return http.StatusUnauthorized, errors.New("Account banned") } status, err := SetCookie(w, user.Token) if err != nil {