Skip to content

[pull] main from moudey:main #25

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

Merged
pull merged 7 commits into from
Jan 29, 2025
Merged

[pull] main from moudey:main #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
072cbea
Update setup.wxs
XY0797 Jan 27, 2025
645fbce
Fix copy shortcut target path
XY0797 Jan 27, 2025
e611677
Update sel.html
XY0797 Jan 27, 2025
9717a3c
Add language string
XY0797 Jan 27, 2025
893d6a0
Update zh-CN.nss
XY0797 Jan 27, 2025
79c7a20
Update the language loading logic in shell.ns
XY0797 Jan 27, 2025
94adc1d
Merge pull request #611 from XY0797/master
moudey Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/functions/sel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ <h5>sel.meta</h5>
</section>
<section id="sel.lnk" class="my-5">
<h5>sel.lnk</h5>
<p>Return a path from the shortcut</p>
<p>Return the target file/dir path from the selected shortcut</p>
<p>Syntax</p>
<code>sel.lnk(path)</code>
<code>sel.lnk</code>
</section>
<section id="sel.lnk.type" class="my-5">
<h5>sel.lnk.type</h5>
Expand Down
4 changes: 2 additions & 2 deletions src/bin/imports/file-manage.nss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
{
menu(separator="after" title=title.copy_path image=icon.copy_path)
{
item(where=sel.count > 1 title='Copy (@sel.count) items selected' cmd=command.copy(sel(false, "\n")))
item(where=sel.count > 1 title=loc.copy_multiple_paths cmd=command.copy(sel(false, "\n")))
item(mode="single" title=@sel.path tip=sel.path cmd=command.copy(sel.path))
item(mode="single" type='file' separator="before" find='.lnk' title='open file location')
item(mode="single" type='file' separator="before" where=length(sel.lnk)>0 title=sel.lnk cmd=command.copy(sel.lnk))
separator
item(mode="single" where=@sel.parent.len>3 title=sel.parent cmd=@command.copy(sel.parent))
separator
Expand Down
2 changes: 2 additions & 0 deletions src/bin/imports/lang/en.nss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ windows_notepad="Windows notepad"

// file-manage.nss
file_manage="File manage"
copy_multiple_paths='Copy (@sel.count) items selected'
all="All"
invert="Invert"
none="None"
Expand Down Expand Up @@ -73,6 +74,7 @@ apps="Apps"
paint="Paint"
edge="Edge"
calculator="Calculator"
windows="windows"
cascade_windows="Cascade windows"
Show_windows_stacked="Show windows stacked"
Show_windows_side_by_side="Show windows side by side"
Expand Down
6 changes: 5 additions & 1 deletion src/bin/imports/lang/zh-CN.nss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
Simplified Chinese
by: github.com/JohnsonRan
github.com/XY0797
*/

xxx="欢迎用中文"
// shell.nss
pin_unpin="固定/取消固定"

Expand All @@ -13,6 +15,7 @@ windows_notepad="Windows 记事本"

// file-manage.nss
file_manage="文件管理"
copy_multiple_paths='复制选中的 (@sel.count) 个项目'
all="全选"
invert="反选"
none="全不选"
Expand All @@ -35,7 +38,7 @@ accessed="访问时间"
new_folder="新建文件夹"
new_file="新建文件"
datetime="当前时间"
guid="GUID"
guid="Guid"

// goto.nss
folder="文件夹"
Expand Down Expand Up @@ -66,6 +69,7 @@ ethernet="以太网"
wifi="WLAN"
connections="网络连接"


// taskbar.nss
apps="应用"
paint="画图"
Expand Down
7 changes: 4 additions & 3 deletions src/bin/shell.nss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@

// localization
$loc_path='imports\lang\'
import lang if(path.exists(loc_path + sys.lang + ".nss"),
loc_path + sys.lang + ".nss",
loc_path + "\\en.nss")
import lang loc_path + "en.nss"
import lang if(path.exists(loc_path + sys.lang + ".nss"),
loc_path + sys.lang + ".nss",
loc_path + "en.nss")

// or import lang 'imports/lang/en.nss'

Expand Down
5 changes: 5 additions & 0 deletions src/setup/wix/setup.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@
<Component Id='LANG' Guid='{FF987BEA-6195-4C05-8523-00936A1BD092}' NeverOverwrite='yes'>
<File Id='en.nss' Source='$(var.bin)\imports\lang\en.nss' />
<File Id='ar.nss' Source='$(var.bin)\imports\lang\ar.nss' />
<File Id='de_DE.nss' Source='$(var.bin)\imports\lang\de-DE.nss' />
<File Id='ko.nss' Source='$(var.bin)\imports\lang\ko.nss' />
<File Id='no.nss' Source='$(var.bin)\imports\lang\no.nss' />
<File Id='pt_BR.nss' Source='$(var.bin)\imports\lang\pt-BR.nss' />
<File Id='zh_CN.nss' Source='$(var.bin)\imports\lang\zh-CN.nss' />
</Component>
</Directory>
</Directory>
Expand Down