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.

Sign up for GitHub

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

Jump to bottom

Fix over-translated lang tags #1911

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Fix over-translated lang tags #1911

merged 1 commit into from
Nov 25, 2024

Conversation

themerekat
Copy link
Collaborator

Pull Request Checklist:

Some lang tags had been translated twice

Pre-Approval

  • There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
  • Hotfixes should be branched off of the master branch and PR'd using the merge option (not squashed) into the hotfix branch.
  • All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
  • There are no linter errors
  • Symbiota coding standards have been followed

Post-Approval

  • It is the code author's responsibility to merge their own pull request after it has been approved
  • If this PR represents a merge into the hotfix branch, remember to use the merge option (i.e., no squash).
  • Don't forget to delete your feature branch upon merge. Ignore this step as required.

@themerekat themerekat merged commit 8576abf into hotfix Nov 25, 2024
@themerekat themerekat deleted the fix-taxa-lang-tag branch November 25, 2024 17:16
GregoryPost added a commit that referenced this pull request Dec 11, 2024
@GregoryPost
Hotfix 3.1.5 (#1956)
6d09b1d 
* Add login form button to prevent circular links
* Bump symfony/process from 5.4.19 to 5.4.46 in /api
* Bump symfony/http-foundation from 5.4.20 to 5.4.46 in /api
* Remove non-template contacts and aboutproject files (#1864)
* Add condition for elevation type number in searchform.js, fixed typo for maximum elevation
* Fix typos
* Unify top/northern, bottom/southern usage
* Fix image alignment and button names in flashcards (#1881)
* Fix image alignment and button names
* Add stylesheet, removed in-line styling, added flex classes for games in main.css
* Fix over-translated lang tags (#1911)
* closes #1916 by removing union return type
* Fix parsing issue
* Fix (#1920)
* Resolve editor lock bug
* Resolves issue: #1923
* Collection Profile issue
* Add form value interpolation for EW NS and units values so sessions is loaded correctly
* Update API Vendor Libraries
* Closes #1942 Adjust Language Tags of Cross Portal Results
* Improve Sign-in and Contact Us button layout on <768px wide devices.

---------
Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Katie Pearson <[email protected]>
Co-authored-by: Nikita Salikov <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
This was referenced Dec 12, 2024
Merged
Merged
themerekat added a commit to BioKIC/African-Herbaria that referenced this pull request Dec 12, 2024
@themerekat @egbot
@Atticus29 @MuchQuak @GregoryPost
Update to 3.1.5 (#42)
acd0a32 
* 3.1.1 Release: Merge Hotfix branch into Master (BioKIC#1747)

* Occurrence Mapping: Adjust SQL to relax enforcement of link to taxon thesaurus, thus to include records with coordinates but lacking thesaurus relationship 
* Styling: Various styling, spacing, and display adjustments 
* Occurrence search: add type attribute to buttons to avoid defaulting as submit buttons 
* Occurrence Profile: Fix error triggered when otherCatalogNumbers are used to create backlink to original snapshot record within external institution web resource
* Occurrence editing functions  
-- Fix fatal error triggered by cloning an occurrence record with the create association option selected
-- Fix fatal error triggered when quick association feature is activated within occurrence editor
-- Fix fatal error when deleting an occurrence when the occurrence was previously deleted (e.g. record already in omoccurarchive)
-- Adjust occurrence restore option to dynamically determine associationType when restoring a record that was deleted prior to this field being added as a required input
-- If resource association does not have an objectID, use url as the display text
* Taxonomy editor: bug fix triggered by adding a child directly to the root node of the thesaurus (e.g. kingdom)
* Scientific name parsing utility functions: Integrate cleanInfra function directly into code. It served no purpose being separate, and was also causing a bug where parent authors were being incorrectly merged with insfraspecific authors

---------

Co-authored-by: Katie Pearson <[email protected]>
Co-authored-by: Mark <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>

* 3.1.2 Release: Merge Hotfix branch into Master (BioKIC#1770)

* Hotfix v.3.1.3  (BioKIC#1821)

* Hotfix v3.1.3 
- Adjusted hotfix merge instructions
- Inventory Management: Bug fix interfering with adding new editors to an inventory project
- Image migration modifications
-- Add option to copy over existing target files
-- Add checks and error handling for non-existent source files and already existing target files
-- Direct log files to be written to /content/logs/
- fix misspelled log directory name, with support still maintained for portals that already have the misspelled directory
- Fix jquery selector to be correct so button is enabled when trait is changed
- Misc language file and wording adjustments

* Hotfix 3.1.4  (BioKIC#1858)

- Checklist voucher link bug 
-- Resolves issue where checklist link PK is not passed to link function. 
-- Resolves issue: BioKIC#1828
- Specimen upload bug
-- Add IGNORE to avoid complete failure of insert statement
-- Capture and display warnings to user
-- Fix display of final record process count
- Occurrence Search breadcrumb bug fix 
-- Add comingFrom variable to pagination links within the list and tablelist pages
-- If comingFrom variable is not set, or set to anything other than "newsearch" or "harvestparams", set the variable to what is defined as the default within the symbini file. If default action is not defined within symbini, default to new search form.
-- Add comingFrom variable to harvestparams.php form
-- Resolves issue: BioKIC#1840
- Occurrence Association Form Validation bug
-- Fix issue with internal association form validation failing and allowing for creation of an association without an internal occurrence being defined
-- Add form validation for external resource and general observation
-- Addresses issue: BioKIC#1852
-- Add guid omoassociations RecordID on insert within occurrence editor
- Vendor library updates via composer 
-- update phpoffice/phpspreadsheet to v3.3.0
-- updated phpseclib/phpseclib explicitly to v3.0.42
-- update phpoffice/phpword to v1.3.0
- Fix data binding bug associated with searching occurrence via GUID within Occurrence Profile pages 
- Misc language translation issues

* Hotfix 3.1.5 (BioKIC#1956)

* Add login form button to prevent circular links
* Bump symfony/process from 5.4.19 to 5.4.46 in /api
* Bump symfony/http-foundation from 5.4.20 to 5.4.46 in /api
* Remove non-template contacts and aboutproject files (BioKIC#1864)
* Add condition for elevation type number in searchform.js, fixed typo for maximum elevation
* Fix typos
* Unify top/northern, bottom/southern usage
* Fix image alignment and button names in flashcards (BioKIC#1881)
* Fix image alignment and button names
* Add stylesheet, removed in-line styling, added flex classes for games in main.css
* Fix over-translated lang tags (BioKIC#1911)
* closes BioKIC#1916 by removing union return type
* Fix parsing issue
* Fix (BioKIC#1920)
* Resolve editor lock bug
* Resolves issue: BioKIC#1923
* Collection Profile issue
* Add form value interpolation for EW NS and units values so sessions is loaded correctly
* Update API Vendor Libraries
* Closes BioKIC#1942 Adjust Language Tags of Cross Portal Results
* Improve Sign-in and Contact Us button layout on <768px wide devices.

---------
Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Katie Pearson <[email protected]>
Co-authored-by: Nikita Salikov <[email protected]>
Co-authored-by: MuchQuak <[email protected]>

---------

Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Mark <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>
Co-authored-by: Greg Post <[email protected]>
Co-authored-by: Greg Post <[email protected]>
themerekat added a commit to BioKIC/African-Herbaria that referenced this pull request Dec 13, 2024
@themerekat @egbot
@Atticus29 @MuchQuak @GregoryPost
Update to 3.1.5.1 (#43)
bc886a9 
* 3.1.1 Release: Merge Hotfix branch into Master (BioKIC#1747)

* Occurrence Mapping: Adjust SQL to relax enforcement of link to taxon thesaurus, thus to include records with coordinates but lacking thesaurus relationship 
* Styling: Various styling, spacing, and display adjustments 
* Occurrence search: add type attribute to buttons to avoid defaulting as submit buttons 
* Occurrence Profile: Fix error triggered when otherCatalogNumbers are used to create backlink to original snapshot record within external institution web resource
* Occurrence editing functions  
-- Fix fatal error triggered by cloning an occurrence record with the create association option selected
-- Fix fatal error triggered when quick association feature is activated within occurrence editor
-- Fix fatal error when deleting an occurrence when the occurrence was previously deleted (e.g. record already in omoccurarchive)
-- Adjust occurrence restore option to dynamically determine associationType when restoring a record that was deleted prior to this field being added as a required input
-- If resource association does not have an objectID, use url as the display text
* Taxonomy editor: bug fix triggered by adding a child directly to the root node of the thesaurus (e.g. kingdom)
* Scientific name parsing utility functions: Integrate cleanInfra function directly into code. It served no purpose being separate, and was also causing a bug where parent authors were being incorrectly merged with insfraspecific authors

---------

Co-authored-by: Katie Pearson <[email protected]>
Co-authored-by: Mark <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>

* 3.1.2 Release: Merge Hotfix branch into Master (BioKIC#1770)

* Hotfix v.3.1.3  (BioKIC#1821)

* Hotfix v3.1.3 
- Adjusted hotfix merge instructions
- Inventory Management: Bug fix interfering with adding new editors to an inventory project
- Image migration modifications
-- Add option to copy over existing target files
-- Add checks and error handling for non-existent source files and already existing target files
-- Direct log files to be written to /content/logs/
- fix misspelled log directory name, with support still maintained for portals that already have the misspelled directory
- Fix jquery selector to be correct so button is enabled when trait is changed
- Misc language file and wording adjustments

* Hotfix 3.1.4  (BioKIC#1858)

- Checklist voucher link bug 
-- Resolves issue where checklist link PK is not passed to link function. 
-- Resolves issue: BioKIC#1828
- Specimen upload bug
-- Add IGNORE to avoid complete failure of insert statement
-- Capture and display warnings to user
-- Fix display of final record process count
- Occurrence Search breadcrumb bug fix 
-- Add comingFrom variable to pagination links within the list and tablelist pages
-- If comingFrom variable is not set, or set to anything other than "newsearch" or "harvestparams", set the variable to what is defined as the default within the symbini file. If default action is not defined within symbini, default to new search form.
-- Add comingFrom variable to harvestparams.php form
-- Resolves issue: BioKIC#1840
- Occurrence Association Form Validation bug
-- Fix issue with internal association form validation failing and allowing for creation of an association without an internal occurrence being defined
-- Add form validation for external resource and general observation
-- Addresses issue: BioKIC#1852
-- Add guid omoassociations RecordID on insert within occurrence editor
- Vendor library updates via composer 
-- update phpoffice/phpspreadsheet to v3.3.0
-- updated phpseclib/phpseclib explicitly to v3.0.42
-- update phpoffice/phpword to v1.3.0
- Fix data binding bug associated with searching occurrence via GUID within Occurrence Profile pages 
- Misc language translation issues

* Hotfix 3.1.5 (BioKIC#1956)

* Add login form button to prevent circular links
* Bump symfony/process from 5.4.19 to 5.4.46 in /api
* Bump symfony/http-foundation from 5.4.20 to 5.4.46 in /api
* Remove non-template contacts and aboutproject files (BioKIC#1864)
* Add condition for elevation type number in searchform.js, fixed typo for maximum elevation
* Fix typos
* Unify top/northern, bottom/southern usage
* Fix image alignment and button names in flashcards (BioKIC#1881)
* Fix image alignment and button names
* Add stylesheet, removed in-line styling, added flex classes for games in main.css
* Fix over-translated lang tags (BioKIC#1911)
* closes BioKIC#1916 by removing union return type
* Fix parsing issue
* Fix (BioKIC#1920)
* Resolve editor lock bug
* Resolves issue: BioKIC#1923
* Collection Profile issue
* Add form value interpolation for EW NS and units values so sessions is loaded correctly
* Update API Vendor Libraries
* Closes BioKIC#1942 Adjust Language Tags of Cross Portal Results
* Improve Sign-in and Contact Us button layout on <768px wide devices.

---------
Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Katie Pearson <[email protected]>
Co-authored-by: Nikita Salikov <[email protected]>
Co-authored-by: MuchQuak <[email protected]>

* Header render Fixes (BioKIC#1962)

* Switch header buttons to use HTML button element for better UX
* Adjust styling to restoring honoring header button text color
* Improve header button layout on <768px display

---------

Co-authored-by: Edward Gilbert <[email protected]>
Co-authored-by: Mark <[email protected]>
Co-authored-by: MuchQuak <[email protected]>
Co-authored-by: Logan Wilt <[email protected]>
Co-authored-by: Greg Post <[email protected]>
Co-authored-by: Greg Post <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GregoryPost GregoryPost GregoryPost approved these changes

@NikitaSalikov NikitaSalikov Awaiting requested review from NikitaSalikov

@MuchQuak MuchQuak Awaiting requested review from MuchQuak

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@themerekat @GregoryPost