Skip to content

upc translation formatting & js updated#888

Merged
limetech merged 3 commits into
unraid:masterfrom
zackspear:master
Jul 4, 2021
Merged

upc translation formatting & js updated#888
limetech merged 3 commits into
unraid:masterfrom
zackspear:master

Conversation

@zackspear

Copy link
Copy Markdown
Contributor

No description provided.

@limetech

Copy link
Copy Markdown
Contributor

Instead of string /boot/config you should simply say 'config', as in:

_('The key file should be located in the "config" directory on your USB Flash boot device')

I don't know about the quotes around "config" - would be good to have them or else display that word in monospace - not sure how to do that in a translated string.

The reason for this: when the USB flash is plugged into a PC you don't see a 'boot' diretory, you just see a 'config' directory. Similar if you access the 'flash' share on the network - no 'boot' directory.

'/boot' is the name of the mount point on which the flash partition 1 is mounted. So if you are referencing via Terminal window then you would reference '/boot/config' - but most people don't do this, and those that do, know what's happening.

@zackspear

Copy link
Copy Markdown
Contributor Author

10-4. Will run through all the copy and update /boot/config to config.

I'll attempt to emphasize "config" either with italics or <code> if the translation setup allows for it. Because we don't ship translations.txt in /usr/local/emhttp/languages by default I'm not sure it'll be possible.

@bergware

bergware commented Jun 30, 2021

Copy link
Copy Markdown
Contributor

For translations you can do something like this:

_('The key file should be located in the *config* directory on your USB Flash boot device')

This would display config in italics
The translation file will have an entry like this:

The key file should be located in the config directory on your USB Flash boot device=The key file should be located in the *config* directory on your USB Flash boot device

@zackspear

Copy link
Copy Markdown
Contributor Author

Thanks @bergware for confirming that. Was going to try it but wasn't 100% certain on it working.

@limetech copy updated in latest commit per request.

@limetech limetech merged commit b65e943 into unraid:master Jul 4, 2021
mgutt added a commit to mgutt/webgui that referenced this pull request Jan 1, 2026
This addresses remaining feedback items and UI bugs:

Popular Destinations Context Fix:
- Add SHOW_POPULAR filter to copy/move operations (cases 3,4,8,9 in doAction)
- Add SHOW_POPULAR,HIDE_FILES_FILTER to bulk copy/move (doActions cases 3,4)
- FileTree.php now checks in_array('SHOW_POPULAR', $filters) instead of always showing
- Prevents Popular from appearing in Docker path selection and other contexts
- Works seamlessly with existing filter[] POST mechanism (no jquery.filetree.js changes)

Variable Conflict Resolution:
- Rename $root to $fileTreeRoot throughout FileTree.php
- Fixes conflict with Translations.php which overwrites $root variable (lines 128/140/176)
- Add Translations.php include for _('Popular') translation support

Display Improvements:
- Show full paths in Popular destinations instead of basename for clarity
- Add ui-corner-all class to all 4 File Manager dialogs for rounded corners
- Fix CSS: replace hardcoded unraid#888 with var(--alt-text-color) in default-dynamix.css
- Change all 6 margin-bottom from '20vh' to '320px' for consistent spacing

Code Cleanup:
- Remove unused $autocomplete variable (never set as POST parameter)
- Update comments to reflect actual behavior

Result: Popular destinations only appear in File Manager operations, not in Docker
or other file pickers. All dialogs now have consistent rounded corners.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants