Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stringsupdate #2062

Merged
merged 31 commits into from Oct 3, 2019
Merged

Stringsupdate #2062

merged 31 commits into from Oct 3, 2019

Conversation

@lachlan-00
Copy link
Member

lachlan-00 commented Oct 2, 2019

Scrutinizer changes as well as the massive stringsupdate from #1957

Please merge when you can also update Transifex with a squash and merge.

lachlan-00 added 22 commits Sep 13, 2019
remove gigantic debug
remove gigantic debug
@lachlan-00 lachlan-00 changed the title Scruninizer Bug Hunting Scrutinizer Bug Hunting Oct 2, 2019
lachlan-00 added 6 commits Oct 2, 2019
* allow cell wrapping for Ampache Debug

* add -u to bin/catalog_update.inc (Requires last.fm apikey)

* Look for updated artist information. (missing or 6 months since last update)
* Update similar artists from local artists as well

* fix #1985 (tag debug messages were inaccurate)

* Update tag.class.php

* add for the love of music, and added some missing (#2011)

* add for the love of music, and added some missing

* Add translation to test_error_page

* viewport and page style fixes (#2010)

* viewport and page style fixes
* remove install-doped.css
* Update default.css

* Big changes for: disk, album, tag, art and QOL updates (remove disk 0) (#1964)

* Add new id3 tags to the database (album table).
  * original_year (release year)
  * barcode
  * catalog_number (moved out of song_data into album)
* default to disk 1 instead of disk 0
* update bin/sort_files.inc so that it actually works
* Add new functions for stat updates 
  * UserActivity::migrate
  * Userflag::migrate
  * Rating::migrate
  * Catalog::migrate
* Faster tag updates/catalog verify! (Updating an album would update each file multiple times)
* UI update grouping after removing disk0
* genre, comment, disk missing from catalog ui and sort_files
* add new fields to edit window and song pages
* add new items to add_catalog and sort_files.inc
* sort_files is actually working correctly
* add -v to sort_files.inc to edit Various Artist text
* Don't update art for no reason
* Update/verify order based on last update time
* simplify file mode check with array
* single albums again for newest
* stop album code overwriting good data
* don't query config so much for art setting
* update the old album with the new one
* fix error deleting an object in wanted.
* redirect the target for changes when id changes target
* redirect target for art search as well

* Update show_add_catalog.inc.php

* Update show_edit_catalog.inc.php

* some consolidation and hints

* Usage: and another hint

* only fail php-gd check once (#2013)

* Simplify logic for .loginoptions (#2016)

* add some forgotten strings to translation

* Update init-tiny.php

* clearer catalog/song updates, close #2015  (#2019)

* Update song.update_time when artist/album change
* close #2015
* compare_song_information only for songs
* don't check songs for artist/album changes

* Code style and sql bugs with disabled catalogs (#2020)

* sql bugs when catalog disabled
* scrutinizer patches
* Update sort_files.inc
* add debug for stat's migration and debug for errors in migration

* fix bug from #2016 (#2022)

forgot password link disappeared

* starting to finalise

* more cleaning and humanising

* get rid of odd error language

* php-cs

* Type T_(

* fix introduced bugs

* Cleanup multi-line strings (#2026)

* Cleanup multi-line strings

* hints

* Update privatemsg.class.php

* Subsonic 1.13.0 compatability (#1965)

Subsonic 1.13.0 is ready! Use your API Key when using new clients that require token authentication.

close #1952 by reverting 616aaba#diff-56e0a5be46c2596d0fb3bff7ac4cbb4c
close #1569
close #1352
close #1389
close #1405
close #1969
close nvllsvm/Audinaut#15

* Update subsonic_xml_data.class.php
  * getTopSongs
  * Add updateUser
  * only reqiure username for updateUser
  * get group discs with id3 enabled.
  * reduce random complexity
* add auth::token_check
* add random::advanced_sql
* get full album track count when grouped
* reduce some construct complexity
* update getalbumlist add search::year_search

* Update subsonic_api.class.php

* Update shoutbox.class.php

* usage duplicates

* no double questions

* add access_level_to_name

* User::access_level_to_name

* docstring

* Update user.class.php

* description can be translated

* translate localplay as well

* Update shoutbox.class.php

* update democratic to use name from level

* simplify some code

* more simplification

* Update broadcast_server.class.php

* Update broadcast_server.class.php

* typos

* Update broadcast_server.class.php

* id variable cleaning

* force an int when null browsing

* nugs i introduced butting code

* validat ip needs the human readable version

* Update user.class.php

* what a collossal typo

* Update browse.class.php

* reverting names.

* Update song.class.php

bug creating empty artist/albums

* review of strings part 1 (#2028)

* don't migrate albumartist

album::check should be doing that

* user avatar and warnings

* Update user.class.php

* Strings update review 2 (#2029)

* move menu items around

add logout to sidebar.

* Update sidebar_home.inc.php

* php-cs

* move tag cloud down

* Update sidebar_preferences.inc.php

* Update sidebar_home.inc.php

* don't remove an image if the new one sucks

* add transparency to logout

* Update topmenu-logout.png

* Update topmenu-logout.png

* respect colour theme for edit dialog

* track order

* Stringsupdate (#2033)

* Strings update review 3

* php-cs-fixer

* tracks / mark as

* remove gettext_noop

need to test

* Propelled

* Update users.php

* Stop showing 'Disk 1' everywhere when not required. (#2036)

* fix #2031
* subsonic api requires strings for id's [ strawberrymusicplayer/strawberry/issues/255 ]
* comment out sql debug events
* group by default on new installs

* Update catalog.class.php

skip error reading catalog during long updates.

* Update subsonic_xml_data.class.php

* no space for multi disk

* Merge branch 'develop' into stringsupdate

* SVG support for themes and images (#2035)

* Add ability for themes to use SVG icons
* remove sprite from theme
* find svg first (if it exists)
* add more icons/images to be retrieved via UI class
* move icons that don't exist into base images folder.

* id attribute in get_icon/image (#2039)

* double fix album groups for #2023 (#2037)

* Identify groups of disks better, using more than just mbid
* Artist::get_by_year is just a search query so use a search link instead
* Artist::get_albums counts correctly for artist, album, time

* fix weird logout link problem

* mobile padding for logo

* grouping sql fixes (#2040)

better handling of different tags when identifying groups and counts relating to albums

* Add untranslated strings from HTML5 Player (#2041)

* Add untranslated strings from HTML5 Player

* Added translations to title and alt attributes

* Group and split searches correctly (#2042)

* get Album->release_type as it can be used before f_release_type is set
* Search box wasn't grouping/splitting very well.
* Tested using multiple variations of album tags on:
  * API, Subsonic, Web with Grouping / not-grouping enabled.

* reduce duplicate T_( runs

* php-cs

* Update jplayer.midnight.black-iframed.css

hid the minimize button again.

* combining translations into variables

* Update sidebar_home.inc.php

* Update sidebar_home.inc.php

* bugfixes (#2043)

* Album::sanitize_disk()

* start at 1

* fix headphones call for artist

* Update show_random_videos.inc.php

remove gigantic debug

* pasted self

* $t_string

* remove inline style (#2046)

* move footer statistics to the page being loaded

* php-cs

* Update footer.inc.php

* try to only show query stats once

* remove some stats lines

* reduce lines again

* more

* hopefully all the dupes now.

* more bottom box

* php-cs

* testing; will revert after checking

* seems to be keeping the true

* last test before revert

* Revert "last test before revert"

This reverts commit 9c3b572.

* Revert "seems to be keeping the true"

This reverts commit 0bf879e.

* Revert "testing; will revert after checking"

This reverts commit bd635ee.

* might help to actually look for $stats

* look for $stats and conf

* Revert "move footer statistics to the page being loaded"

This reverts commit 3cffa2d.

* do this in a cleaner way

* query from a method

* much better!

* Update export.php

* $t_ampache

* Update stats.class.php

* followbtn needs a light color

* Update show_login_form.inc.php

* make it pretty

* Update show_query_stats.inc.php

* make it separate to item-count

* color for query-count

* debug doesn't show array values. (theme_css_base)

* php-cs

* mysql full group fixes

* Sidebar tweak and translation add (#2048)

* js doublequote

* plugin desctiptions to contstruct

* php-cs

* Revert "php-cs"

had some working code from another branch

* fix subsonic getcoverart for album lists

al- isn't being stripped from the id while the rest are okay.

* Update CHANGELOG.md

fix markdown for changelog.

* Manage Plugins

needs to differentiate from config

* link to the wiki for tvshows

* require a handshake and generate unique sessions

* Api::goodbye()

* Api::get_indexes()

* fix playlist indexes

* php-cs

* Update api.class.php

get counts for smartlists as well

* allow encrypted apikey auth

* Update xml_data.class.php

* remove cruft

* Core::get_cookie

* filter_has_var

* Update session.class.php

* docstring

* revert has_var

* get subcategory id's for indexes.

* Update xml_data.class.php

* get_indexes for album and playlist track

* check for auth'ed api sessions in user::

* get track id for playlists

* subsonic api for playlists

* get flat art for playlists

* subsonic. get random item art for lists

* Update subsonic_api.class.php

* Update subsonic_api.class.php

* Update subsonic_api.class.php

cover art for playlists and smartlists

* Update subsonic_api.class.php

* api::check_parameter for mandatory fields.

* php-cs

* add check parameter to some calls

* Update api.class.php

* add more parameter checks

* add xml_data::success. Remove XML_Data::single_string

* tell me where subsonic passes and fails in debug

* codestyle

* api::stream, api::download

Move follow stream to Stream::follow_stream

* always scrobble a stream

* Update api.class.php

* Api::get_art

* codacy

* codacy

* has username + apikey for auth

* Update user.class.php

* Update CHANGELOG.md

* Api::user_*

* Update api.class.php

* Update api.class.php

* Update CHANGELOG.md

* usage

* Update show_user.inc.php

* only destroy api sessions

* set username and id from auth key

* don't kill everything

* keep it out of the session destroy

* doesn't kill everything now.

* Update api.class.php

* Update user.class.php

* get stream urls for api

* Update api.class.php

* just send me the file

* almost ready

* ready to merge

* make xml format cleaner

* Update registration.class.php

* backticks in queries

* unfix the footer again.

* fix markdown

* Let catalog manager actually edit catalogs

* add to playlist

* php-cs

* report sql query on errors so i don't have to keep debugging individual queries

* podcast episode trying to get albumsuite

* fix, shares not getting a description, subsonic genre count and podcast episodes

* T_('RSS Feed')

* Add All to playlist

* Update icon_playlist_add_all.png

transparency

* Update icon_playlist_add_all.png

* fix bug with now_playing and podcasts

* allow any branch

* Update CHANGELOG.md

* Update autoupdate.class.php

* display forced branch

* set git_branch

* a preference missing changes

* Update update.class.php

* Update CHANGELOG.md

* Update local.catalog.php

* Update album.class.php

* scrutinizer
@lachlan-00 lachlan-00 mentioned this pull request Oct 2, 2019
@lachlan-00 lachlan-00 changed the title Scrutinizer Bug Hunting Stringsupdate Oct 2, 2019
@lachlan-00 lachlan-00 requested a review from Psy-Virus Oct 2, 2019
lib/class/api.class.php Outdated Show resolved Hide resolved
@Psy-Virus

This comment has been minimized.

Copy link
Member

Psy-Virus commented Oct 3, 2019

Hey @lachlan-00, what exactly do you mean by

Please merge when you can also update Transifex with a squash and merge.

?

Transifex updates the source strings by itself once a day. Then, if changes happen, the translators can start working on them and I pull the changes from Transifex and merge them here.

I could ofc cancel Transifex from updating the source, upload the new source file manually and we can wait for the Translators to finish. But I think the way we do it usually is better, as people can see the strings in context of the UI and stuff. Even if that means that we have an not completely translated release.

:)

@lachlan-00

This comment has been minimized.

Copy link
Member Author

lachlan-00 commented Oct 3, 2019

Hey @lachlan-00, what exactly do you mean by

Please merge when you can also update Transifex with a squash and merge.

?

Transifex updates the source strings by itself once a day. Then, if changes happen, the translators can start working on them and I pull the changes from Transifex and merge them here.

I could ofc cancel Transifex from updating the source, upload the new source file manually and we can wait for the Translators to finish. But I think the way we do it usually is better, as people can see the strings in context of the UI and stuff. Even if that means that we have an not completely translated release.

:)

Good to know! I always assumed that you had to manually sync with transifex which is why i assigned this to you

@lachlan-00 lachlan-00 merged commit 6ab20ec into ampache:develop Oct 3, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@kuzi-moto

This comment has been minimized.

Copy link
Contributor

kuzi-moto commented Oct 3, 2019

Can't believe it's finally merged!

@lachlan-00

This comment has been minimized.

Copy link
Member Author

lachlan-00 commented Oct 3, 2019

It's time!

Now it's time to bug fix and document!

@stebe

This comment has been minimized.

Copy link
Contributor

stebe commented Oct 3, 2019

Great work on this update. I'm impressed on how bug free after playing around different menus and functions for the last 45 minutes. Now doing a catalog update on my largest catalog.

@lachlan-00

This comment has been minimized.

Copy link
Member Author

lachlan-00 commented Oct 3, 2019

Really Appreciated! There's some bug fixes in there for you @stebe.

The branch was my daily driver for about a month so it's had the time to settle. :)

@Psy-Virus

This comment has been minimized.

Copy link
Member

Psy-Virus commented Oct 4, 2019

Hey @lachlan-00, what exactly do you mean by

Please merge when you can also update Transifex with a squash and merge.

?
Transifex updates the source strings by itself once a day. Then, if changes happen, the translators can start working on them and I pull the changes from Transifex and merge them here.
I could ofc cancel Transifex from updating the source, upload the new source file manually and we can wait for the Translators to finish. But I think the way we do it usually is better, as people can see the strings in context of the UI and stuff. Even if that means that we have an not completely translated release.
:)

Good to know! I always assumed that you had to manually sync with transifex which is why i assigned this to you

Well I guess I had a brain lag yesterday...
So how it's working is:
I update the messages.pot -> PR it -> after merge Transifex is pulling it and updating the sources in Transifex itself. And about once a month I pull the stuff from Transifex and PR it here.

So ehm.... Update is coming in a few minutes. Then the translators can hack the new translations in... 😁

@lachlan-00

This comment has been minimized.

Copy link
Member Author

lachlan-00 commented Oct 4, 2019

Okay! I think i'll write this down in the wiki so we remember

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.