From c2b801ef330f44970313ac7edee127f6145b875a Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 23 Nov 2022 11:56:04 +0100 Subject: [PATCH 1/6] Make English strings array easier to be read --- tinyfilemanager.php | 179 ++++++++++++++++++++++++++++---------------- 1 file changed, 116 insertions(+), 63 deletions(-) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index a25bc11..8df88cc 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -4104,69 +4104,122 @@ $isStickyNavBar = $sticky_navbar ? 'navbar-fixed' : 'navbar-normal'; function lng($txt) { global $lang; - // English Language - $tr['en']['AppName'] = 'Tiny File Manager'; $tr['en']['AppTitle'] = 'File Manager'; - $tr['en']['Login'] = 'Sign in'; $tr['en']['Username'] = 'Username'; - $tr['en']['Password'] = 'Password'; $tr['en']['Logout'] = 'Sign Out'; - $tr['en']['Move'] = 'Move'; $tr['en']['Copy'] = 'Copy'; - $tr['en']['Save'] = 'Save'; $tr['en']['SelectAll'] = 'Select all'; - $tr['en']['UnSelectAll'] = 'Unselect all'; $tr['en']['File'] = 'File'; - $tr['en']['Back'] = 'Back'; $tr['en']['Size'] = 'Size'; - $tr['en']['Perms'] = 'Perms'; $tr['en']['Modified'] = 'Modified'; - $tr['en']['Owner'] = 'Owner'; $tr['en']['Search'] = 'Search'; - $tr['en']['NewItem'] = 'New Item'; $tr['en']['Folder'] = 'Folder'; - $tr['en']['Delete'] = 'Delete'; $tr['en']['Rename'] = 'Rename'; - $tr['en']['CopyTo'] = 'Copy to'; $tr['en']['DirectLink'] = 'Direct link'; - $tr['en']['UploadingFiles'] = 'Upload Files'; $tr['en']['ChangePermissions'] = 'Change Permissions'; - $tr['en']['Copying'] = 'Copying'; $tr['en']['CreateNewItem'] = 'Create New Item'; - $tr['en']['Name'] = 'Name'; $tr['en']['AdvancedEditor'] = 'Advanced Editor'; - $tr['en']['RememberMe'] = 'Remember Me'; $tr['en']['Actions'] = 'Actions'; - $tr['en']['Upload'] = 'Upload'; $tr['en']['Cancel'] = 'Cancel'; - $tr['en']['InvertSelection']= 'Invert Selection'; $tr['en']['DestinationFolder'] = 'Destination Folder'; - $tr['en']['ItemType'] = 'Item Type'; $tr['en']['ItemName'] = 'Item Name'; - $tr['en']['CreateNow'] = 'Create Now'; $tr['en']['Download'] = 'Download'; - $tr['en']['Open'] = 'Open'; $tr['en']['UnZip'] = 'UnZip'; - $tr['en']['UnZipToFolder'] = 'UnZip to folder'; $tr['en']['Edit'] = 'Edit'; - $tr['en']['NormalEditor'] = 'Normal Editor'; $tr['en']['BackUp'] = 'Back Up'; - $tr['en']['SourceFolder'] = 'Source Folder'; $tr['en']['Files'] = 'Files'; - $tr['en']['Move'] = 'Move'; $tr['en']['Change'] = 'Change'; - $tr['en']['Settings'] = 'Settings'; $tr['en']['Language'] = 'Language'; - $tr['en']['Folder is empty']= 'Folder is empty'; $tr['en']['PartitionSize'] = 'Partition size'; - $tr['en']['ErrorReporting'] = 'Error Reporting'; $tr['en']['ShowHiddenFiles'] = 'Show Hidden Files'; - $tr['en']['Help'] = 'Help'; $tr['en']['Created'] = 'Created'; - $tr['en']['Free of'] = 'Free of'; $tr['en']['Preview'] = 'Preview'; - $tr['en']['Help Documents'] = 'Help Documents'; $tr['en']['Report Issue'] = 'Report Issue'; - $tr['en']['Generate'] = 'Generate'; $tr['en']['FullSize'] = 'Full Size'; - $tr['en']['FreeOf'] = 'free of'; $tr['en']['CalculateFolderSize']= 'Calculate folder size'; - $tr['en']['HideColumns'] = 'Hide Perms/Owner columns';$tr['en']['You are logged in'] = 'You are logged in'; - $tr['en']['Nothing selected'] = 'Nothing selected'; $tr['en']['Paths must be not equal'] = 'Paths must be not equal'; - $tr['en']['Renamed from'] = 'Renamed from'; $tr['en']['Archive not unpacked'] = 'Archive not unpacked'; - $tr['en']['Deleted'] = 'Deleted'; $tr['en']['Archive not created'] = 'Archive not created'; - $tr['en']['Copied from'] = 'Copied from'; $tr['en']['Permissions changed'] = 'Permissions changed'; - $tr['en']['to'] = 'to'; $tr['en']['Saved Successfully'] = 'Saved Successfully'; - $tr['en']['not found!'] = 'not found!'; $tr['en']['File Saved Successfully'] = 'File Saved Successfully'; - $tr['en']['Archive'] = 'Archive'; $tr['en']['Permissions not changed'] = 'Permissions not changed'; - $tr['en']['Select folder'] = 'Select folder'; $tr['en']['Source path not defined'] = 'Source path not defined'; - $tr['en']['already exists'] = 'already exists'; $tr['en']['Error while moving from'] = 'Error while moving from'; - $tr['en']['Create archive?'] = 'Create archive?'; $tr['en']['Invalid file or folder name'] = 'Invalid file or folder name'; - $tr['en']['Archive unpacked'] = 'Archive unpacked'; $tr['en']['File extension is not allowed'] = 'File extension is not allowed'; - $tr['en']['Root path'] = 'Root path'; $tr['en']['Error while renaming from'] = 'Error while renaming from'; - $tr['en']['File not found'] = 'File not found'; $tr['en']['Error while deleting items'] = 'Error while deleting items'; - $tr['en']['Moved from'] = 'Moved from'; - $tr['en']['Check Latest Version'] = 'Check Latest Version';$tr['en']['Generate new password hash'] = 'Generate new password hash'; - $tr['en']['Login failed. Invalid username or password'] = 'Login failed. Invalid username or password'; - $tr['en']['password_hash not supported, Upgrade PHP version'] = 'password_hash not supported, Upgrade PHP version'; - $tr['en']['Advanced Search'] = 'Advanced Search'; $tr['en']['Error while copying from'] = 'Error while copying from'; - $tr['en']['Invalid characters in file name'] = 'Invalid characters in file name'; - $tr['en']['FILE EXTENSION HAS NOT SUPPORTED'] = 'FILE EXTENSION HAS NOT SUPPORTED'; - $tr['en']['Selected files and folder deleted'] = 'Selected files and folder deleted'; - $tr['en']['Error while fetching archive info'] = 'Error while fetching archive info'; - $tr['en']['Delete selected files and folders?'] = 'Delete selected files and folders?'; - $tr['en']['Search file in folder and subfolders...'] = 'Search file in folder and subfolders...'; - $tr['en']['Access denied. IP restriction applicable'] = 'Access denied. IP restriction applicable'; - $tr['en']['Invalid characters in file or folder name'] = 'Invalid characters in file or folder name'; - $tr['en']['Operations with archives are not available'] = 'Operations with archives are not available'; - $tr['en']['File or folder with this path already exists'] = 'File or folder with this path already exists'; + // English language + $tr = [ + 'en' => [ + 'AppName' => 'Tiny File Manager', + 'AppTitle' => 'File Manager', + 'Login' => 'Sign in', + 'Username' => 'Username', + 'Password' => 'Password', + 'Logout' => 'Sign Out', + 'Move' => 'Move', + 'Copy' => 'Copy', + 'Save' => 'Save', + 'SelectAll' => 'Select all', + 'UnSelectAll' => 'Unselect all', + 'File' => 'File', + 'Back' => 'Back', + 'Size' => 'Size', + 'Perms' => 'Perms', + 'Modified' => 'Modified', + 'Owner' => 'Owner', + 'Search' => 'Search', + 'NewItem' => 'New Item', + 'Folder' => 'Folder', + 'Delete' => 'Delete', + 'Rename' => 'Rename', + 'CopyTo' => 'Copy to', + 'DirectLink' => 'Direct link', + 'UploadingFiles' => 'Upload Files', + 'ChangePermissions' => 'Change Permissions', + 'Copying' => 'Copying', + 'CreateNewItem' => 'Create New Item', + 'Name' => 'Name', + 'AdvancedEditor' => 'Advanced Editor', + 'RememberMe' => 'Remember Me', + 'Actions' => 'Actions', + 'Upload' => 'Upload', + 'Cancel' => 'Cancel', + 'InvertSelection' => 'Invert Selection', + 'DestinationFolder' => 'Destination Folder', + 'ItemType' => 'Item Type', + 'ItemName' => 'Item Name', + 'CreateNow' => 'Create Now', + 'Download' => 'Download', + 'Open' => 'Open', + 'UnZip' => 'UnZip', + 'UnZipToFolder' => 'UnZip to folder', + 'Edit' => 'Edit', + 'NormalEditor' => 'Normal Editor', + 'BackUp' => 'Back Up', + 'SourceFolder' => 'Source Folder', + 'Files' => 'Files', + 'Move' => 'Move', + 'Change' => 'Change', + 'Settings' => 'Settings', + 'Language' => 'Language', + 'Folder is empty' => 'Folder is empty', + 'PartitionSize' => 'Partition size', + 'ErrorReporting' => 'Error Reporting', + 'ShowHiddenFiles' => 'Show Hidden Files', + 'Help' => 'Help', + 'Created' => 'Created', + 'Free of' => 'Free of', + 'Preview' => 'Preview', + 'Help Documents' => 'Help Documents', + 'Report Issue' => 'Report Issue', + 'Generate' => 'Generate', + 'FullSize' => 'Full Size', + 'FreeOf' => 'free of', + 'CalculateFolderSize' => 'Calculate folder size', + 'HideColumns' => 'Hide Perms/Owner columns', + 'You are logged in' => 'You are logged in', + 'Nothing selected' => 'Nothing selected', + 'Paths must be not equal' => 'Paths must be not equal', + 'Renamed from' => 'Renamed from', + 'Archive not unpacked' => 'Archive not unpacked', + 'Deleted' => 'Deleted', + 'Archive not created' => 'Archive not created', + 'Copied from' => 'Copied from', + 'Permissions changed' => 'Permissions changed', + 'to' => 'to', + 'Saved Successfully' => 'Saved Successfully', + 'not found!' => 'not found!', + 'File Saved Successfully' => 'File Saved Successfully', + 'Archive' => 'Archive', + 'Permissions not changed' => 'Permissions not changed', + 'Select folder' => 'Select folder', + 'Source path not defined' => 'Source path not defined', + 'already exists' => 'already exists', + 'Error while moving from' => 'Error while moving from', + 'Create archive?' => 'Create archive?', + 'Invalid file or folder name' => 'Invalid file or folder name', + 'Archive unpacked' => 'Archive unpacked', + 'File extension is not allowed' => 'File extension is not allowed', + 'Root path' => 'Root path', + 'Error while renaming from' => 'Error while renaming from', + 'File not found' => 'File not found', + 'Error while deleting items' => 'Error while deleting items', + 'Moved from' => 'Moved from', + 'Check Latest Version' => 'Check Latest Version', + 'Generate new password hash' => 'Generate new password hash', + 'Login failed. Invalid username or password' => 'Login failed. Invalid username or password', + 'password_hash not supported, Upgrade PHP version' => 'password_hash not supported, Upgrade PHP version', + 'Advanced Search' => 'Advanced Search', + 'Error while copying from' => 'Error while copying from', + 'Invalid characters in file name' => 'Invalid characters in file name', + 'FILE EXTENSION HAS NOT SUPPORTED' => 'FILE EXTENSION HAS NOT SUPPORTED', + 'Selected files and folder deleted' => 'Selected files and folder deleted', + 'Error while fetching archive info' => 'Error while fetching archive info', + 'Delete selected files and folders?' => 'Delete selected files and folders?', + 'Search file in folder and subfolders...' => 'Search file in folder and subfolders...', + 'Access denied. IP restriction applicable' => 'Access denied. IP restriction applicable', + 'Invalid characters in file or folder name' => 'Invalid characters in file or folder name', + 'Operations with archives are not available' => 'Operations with archives are not available', + 'File or folder with this path already exists' => 'File or folder with this path already exists', + ], + ]; $i18n = fm_get_translations($tr); $tr = $i18n ? $i18n : $tr; From bfd52d1095b29c6eb0f68f8b1925d8a2bc7419db Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 23 Nov 2022 11:59:04 +0100 Subject: [PATCH 2/6] Sort strings alphabetically --- tinyfilemanager.php | 202 ++++++++++++++++++++++---------------------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index 8df88cc..e099199 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -4107,117 +4107,117 @@ function lng($txt) { // English language $tr = [ 'en' => [ + 'Access denied. IP restriction applicable' => 'Access denied. IP restriction applicable', + 'Actions' => 'Actions', + 'Advanced Search' => 'Advanced Search', + 'AdvancedEditor' => 'Advanced Editor', + 'already exists' => 'already exists', 'AppName' => 'Tiny File Manager', 'AppTitle' => 'File Manager', - 'Login' => 'Sign in', - 'Username' => 'Username', - 'Password' => 'Password', - 'Logout' => 'Sign Out', - 'Move' => 'Move', - 'Copy' => 'Copy', - 'Save' => 'Save', - 'SelectAll' => 'Select all', - 'UnSelectAll' => 'Unselect all', - 'File' => 'File', + 'Archive not created' => 'Archive not created', + 'Archive not unpacked' => 'Archive not unpacked', + 'Archive unpacked' => 'Archive unpacked', + 'Archive' => 'Archive', 'Back' => 'Back', - 'Size' => 'Size', - 'Perms' => 'Perms', - 'Modified' => 'Modified', - 'Owner' => 'Owner', - 'Search' => 'Search', - 'NewItem' => 'New Item', - 'Folder' => 'Folder', - 'Delete' => 'Delete', - 'Rename' => 'Rename', - 'CopyTo' => 'Copy to', - 'DirectLink' => 'Direct link', - 'UploadingFiles' => 'Upload Files', - 'ChangePermissions' => 'Change Permissions', - 'Copying' => 'Copying', - 'CreateNewItem' => 'Create New Item', - 'Name' => 'Name', - 'AdvancedEditor' => 'Advanced Editor', - 'RememberMe' => 'Remember Me', - 'Actions' => 'Actions', - 'Upload' => 'Upload', + 'BackUp' => 'Back Up', + 'CalculateFolderSize' => 'Calculate folder size', 'Cancel' => 'Cancel', - 'InvertSelection' => 'Invert Selection', - 'DestinationFolder' => 'Destination Folder', - 'ItemType' => 'Item Type', - 'ItemName' => 'Item Name', + 'Change' => 'Change', + 'ChangePermissions' => 'Change Permissions', + 'Check Latest Version' => 'Check Latest Version', + 'Copied from' => 'Copied from', + 'Copy' => 'Copy', + 'Copying' => 'Copying', + 'CopyTo' => 'Copy to', + 'Create archive?' => 'Create archive?', + 'Created' => 'Created', + 'CreateNewItem' => 'Create New Item', 'CreateNow' => 'Create Now', + 'Delete selected files and folders?' => 'Delete selected files and folders?', + 'Delete' => 'Delete', + 'Deleted' => 'Deleted', + 'DestinationFolder' => 'Destination Folder', + 'DirectLink' => 'Direct link', 'Download' => 'Download', + 'Edit' => 'Edit', + 'Error while copying from' => 'Error while copying from', + 'Error while deleting items' => 'Error while deleting items', + 'Error while fetching archive info' => 'Error while fetching archive info', + 'Error while moving from' => 'Error while moving from', + 'Error while renaming from' => 'Error while renaming from', + 'ErrorReporting' => 'Error Reporting', + 'FILE EXTENSION HAS NOT SUPPORTED' => 'FILE EXTENSION HAS NOT SUPPORTED', + 'File extension is not allowed' => 'File extension is not allowed', + 'File not found' => 'File not found', + 'File or folder with this path already exists' => 'File or folder with this path already exists', + 'File Saved Successfully' => 'File Saved Successfully', + 'File' => 'File', + 'Files' => 'Files', + 'Folder is empty' => 'Folder is empty', + 'Folder' => 'Folder', + 'Free of' => 'Free of', + 'FreeOf' => 'free of', + 'FullSize' => 'Full Size', + 'Generate new password hash' => 'Generate new password hash', + 'Generate' => 'Generate', + 'Help Documents' => 'Help Documents', + 'Help' => 'Help', + 'HideColumns' => 'Hide Perms/Owner columns', + 'Invalid characters in file name' => 'Invalid characters in file name', + 'Invalid characters in file or folder name' => 'Invalid characters in file or folder name', + 'Invalid file or folder name' => 'Invalid file or folder name', + 'InvertSelection' => 'Invert Selection', + 'ItemName' => 'Item Name', + 'ItemType' => 'Item Type', + 'Language' => 'Language', + 'Login failed. Invalid username or password' => 'Login failed. Invalid username or password', + 'Login' => 'Sign in', + 'Logout' => 'Sign Out', + 'Modified' => 'Modified', + 'Move' => 'Move', + 'Move' => 'Move', + 'Moved from' => 'Moved from', + 'Name' => 'Name', + 'NewItem' => 'New Item', + 'NormalEditor' => 'Normal Editor', + 'not found!' => 'not found!', + 'Nothing selected' => 'Nothing selected', 'Open' => 'Open', + 'Operations with archives are not available' => 'Operations with archives are not available', + 'Owner' => 'Owner', + 'PartitionSize' => 'Partition size', + 'Password' => 'Password', + 'password_hash not supported, Upgrade PHP version' => 'password_hash not supported, Upgrade PHP version', + 'Paths must be not equal' => 'Paths must be not equal', + 'Permissions changed' => 'Permissions changed', + 'Permissions not changed' => 'Permissions not changed', + 'Perms' => 'Perms', + 'Preview' => 'Preview', + 'RememberMe' => 'Remember Me', + 'Rename' => 'Rename', + 'Renamed from' => 'Renamed from', + 'Report Issue' => 'Report Issue', + 'Root path' => 'Root path', + 'Save' => 'Save', + 'Saved Successfully' => 'Saved Successfully', + 'Search file in folder and subfolders...' => 'Search file in folder and subfolders...', + 'Search' => 'Search', + 'Select folder' => 'Select folder', + 'SelectAll' => 'Select all', + 'Selected files and folder deleted' => 'Selected files and folder deleted', + 'Settings' => 'Settings', + 'ShowHiddenFiles' => 'Show Hidden Files', + 'Size' => 'Size', + 'Source path not defined' => 'Source path not defined', + 'SourceFolder' => 'Source Folder', + 'to' => 'to', + 'UnSelectAll' => 'Unselect all', 'UnZip' => 'UnZip', 'UnZipToFolder' => 'UnZip to folder', - 'Edit' => 'Edit', - 'NormalEditor' => 'Normal Editor', - 'BackUp' => 'Back Up', - 'SourceFolder' => 'Source Folder', - 'Files' => 'Files', - 'Move' => 'Move', - 'Change' => 'Change', - 'Settings' => 'Settings', - 'Language' => 'Language', - 'Folder is empty' => 'Folder is empty', - 'PartitionSize' => 'Partition size', - 'ErrorReporting' => 'Error Reporting', - 'ShowHiddenFiles' => 'Show Hidden Files', - 'Help' => 'Help', - 'Created' => 'Created', - 'Free of' => 'Free of', - 'Preview' => 'Preview', - 'Help Documents' => 'Help Documents', - 'Report Issue' => 'Report Issue', - 'Generate' => 'Generate', - 'FullSize' => 'Full Size', - 'FreeOf' => 'free of', - 'CalculateFolderSize' => 'Calculate folder size', - 'HideColumns' => 'Hide Perms/Owner columns', + 'Upload' => 'Upload', + 'UploadingFiles' => 'Upload Files', + 'Username' => 'Username', 'You are logged in' => 'You are logged in', - 'Nothing selected' => 'Nothing selected', - 'Paths must be not equal' => 'Paths must be not equal', - 'Renamed from' => 'Renamed from', - 'Archive not unpacked' => 'Archive not unpacked', - 'Deleted' => 'Deleted', - 'Archive not created' => 'Archive not created', - 'Copied from' => 'Copied from', - 'Permissions changed' => 'Permissions changed', - 'to' => 'to', - 'Saved Successfully' => 'Saved Successfully', - 'not found!' => 'not found!', - 'File Saved Successfully' => 'File Saved Successfully', - 'Archive' => 'Archive', - 'Permissions not changed' => 'Permissions not changed', - 'Select folder' => 'Select folder', - 'Source path not defined' => 'Source path not defined', - 'already exists' => 'already exists', - 'Error while moving from' => 'Error while moving from', - 'Create archive?' => 'Create archive?', - 'Invalid file or folder name' => 'Invalid file or folder name', - 'Archive unpacked' => 'Archive unpacked', - 'File extension is not allowed' => 'File extension is not allowed', - 'Root path' => 'Root path', - 'Error while renaming from' => 'Error while renaming from', - 'File not found' => 'File not found', - 'Error while deleting items' => 'Error while deleting items', - 'Moved from' => 'Moved from', - 'Check Latest Version' => 'Check Latest Version', - 'Generate new password hash' => 'Generate new password hash', - 'Login failed. Invalid username or password' => 'Login failed. Invalid username or password', - 'password_hash not supported, Upgrade PHP version' => 'password_hash not supported, Upgrade PHP version', - 'Advanced Search' => 'Advanced Search', - 'Error while copying from' => 'Error while copying from', - 'Invalid characters in file name' => 'Invalid characters in file name', - 'FILE EXTENSION HAS NOT SUPPORTED' => 'FILE EXTENSION HAS NOT SUPPORTED', - 'Selected files and folder deleted' => 'Selected files and folder deleted', - 'Error while fetching archive info' => 'Error while fetching archive info', - 'Delete selected files and folders?' => 'Delete selected files and folders?', - 'Search file in folder and subfolders...' => 'Search file in folder and subfolders...', - 'Access denied. IP restriction applicable' => 'Access denied. IP restriction applicable', - 'Invalid characters in file or folder name' => 'Invalid characters in file or folder name', - 'Operations with archives are not available' => 'Operations with archives are not available', - 'File or folder with this path already exists' => 'File or folder with this path already exists', ], ]; From 18fed6336facd5f278a53e10d12bc5171c6b62ac Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 23 Nov 2022 12:06:53 +0100 Subject: [PATCH 3/6] Comment out English strings no more in use --- tinyfilemanager.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index e099199..0d269ac 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -4120,11 +4120,11 @@ function lng($txt) { 'Archive' => 'Archive', 'Back' => 'Back', 'BackUp' => 'Back Up', - 'CalculateFolderSize' => 'Calculate folder size', + //'CalculateFolderSize' => 'Calculate folder size', 'Cancel' => 'Cancel', 'Change' => 'Change', 'ChangePermissions' => 'Change Permissions', - 'Check Latest Version' => 'Check Latest Version', + //'Check Latest Version' => 'Check Latest Version', 'Copied from' => 'Copied from', 'Copy' => 'Copy', 'Copying' => 'Copying', @@ -4155,8 +4155,8 @@ function lng($txt) { 'Files' => 'Files', 'Folder is empty' => 'Folder is empty', 'Folder' => 'Folder', - 'Free of' => 'Free of', - 'FreeOf' => 'free of', + //'Free of' => 'Free of', + //'FreeOf' => 'free of', 'FullSize' => 'Full Size', 'Generate new password hash' => 'Generate new password hash', 'Generate' => 'Generate', @@ -4185,15 +4185,15 @@ function lng($txt) { 'Open' => 'Open', 'Operations with archives are not available' => 'Operations with archives are not available', 'Owner' => 'Owner', - 'PartitionSize' => 'Partition size', + //'PartitionSize' => 'Partition size', 'Password' => 'Password', 'password_hash not supported, Upgrade PHP version' => 'password_hash not supported, Upgrade PHP version', 'Paths must be not equal' => 'Paths must be not equal', 'Permissions changed' => 'Permissions changed', 'Permissions not changed' => 'Permissions not changed', 'Perms' => 'Perms', - 'Preview' => 'Preview', - 'RememberMe' => 'Remember Me', + //'Preview' => 'Preview', + //'RememberMe' => 'Remember Me', 'Rename' => 'Rename', 'Renamed from' => 'Renamed from', 'Report Issue' => 'Report Issue', From b5d592425deb5dde379e860fd00ec2e960ab0e53 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 23 Nov 2022 12:13:56 +0100 Subject: [PATCH 4/6] Add missing translatable strings --- tinyfilemanager.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index 0d269ac..ff30f01 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -4122,6 +4122,7 @@ function lng($txt) { 'BackUp' => 'Back Up', //'CalculateFolderSize' => 'Calculate folder size', 'Cancel' => 'Cancel', + 'Cannot open file! Aborting download' => 'Cannot open file! Aborting download', 'Change' => 'Change', 'ChangePermissions' => 'Change Permissions', //'Check Latest Version' => 'Check Latest Version', @@ -4133,6 +4134,7 @@ function lng($txt) { 'Created' => 'Created', 'CreateNewItem' => 'Create New Item', 'CreateNow' => 'Create Now', + 'dark' => 'dark', 'Delete selected files and folders?' => 'Delete selected files and folders?', 'Delete' => 'Delete', 'Deleted' => 'Deleted', @@ -4146,6 +4148,7 @@ function lng($txt) { 'Error while moving from' => 'Error while moving from', 'Error while renaming from' => 'Error while renaming from', 'ErrorReporting' => 'Error Reporting', + 'Execute' => 'Execute', 'FILE EXTENSION HAS NOT SUPPORTED' => 'FILE EXTENSION HAS NOT SUPPORTED', 'File extension is not allowed' => 'File extension is not allowed', 'File not found' => 'File not found', @@ -4153,6 +4156,7 @@ function lng($txt) { 'File Saved Successfully' => 'File Saved Successfully', 'File' => 'File', 'Files' => 'Files', + 'Filter' => 'Filter', 'Folder is empty' => 'Folder is empty', 'Folder' => 'Folder', //'Free of' => 'Free of', @@ -4160,16 +4164,19 @@ function lng($txt) { 'FullSize' => 'Full Size', 'Generate new password hash' => 'Generate new password hash', 'Generate' => 'Generate', + 'Group' => 'Group', 'Help Documents' => 'Help Documents', 'Help' => 'Help', 'HideColumns' => 'Hide Perms/Owner columns', 'Invalid characters in file name' => 'Invalid characters in file name', 'Invalid characters in file or folder name' => 'Invalid characters in file or folder name', 'Invalid file or folder name' => 'Invalid file or folder name', + 'Invalid Token.' => 'Invalid Token.', 'InvertSelection' => 'Invert Selection', 'ItemName' => 'Item Name', 'ItemType' => 'Item Type', 'Language' => 'Language', + 'light' => 'light', 'Login failed. Invalid username or password' => 'Login failed. Invalid username or password', 'Login' => 'Sign in', 'Logout' => 'Sign Out', @@ -4180,10 +4187,13 @@ function lng($txt) { 'Name' => 'Name', 'NewItem' => 'New Item', 'NormalEditor' => 'Normal Editor', + 'not created' => 'not created', + 'not deleted' => 'not deleted', 'not found!' => 'not found!', 'Nothing selected' => 'Nothing selected', 'Open' => 'Open', 'Operations with archives are not available' => 'Operations with archives are not available', + 'Other' => 'Other', 'Owner' => 'Owner', //'PartitionSize' => 'Partition size', 'Password' => 'Password', @@ -4193,6 +4203,7 @@ function lng($txt) { 'Permissions not changed' => 'Permissions not changed', 'Perms' => 'Perms', //'Preview' => 'Preview', + 'Read' => 'Read', //'RememberMe' => 'Remember Me', 'Rename' => 'Rename', 'Renamed from' => 'Renamed from', @@ -4210,6 +4221,8 @@ function lng($txt) { 'Size' => 'Size', 'Source path not defined' => 'Source path not defined', 'SourceFolder' => 'Source Folder', + 'Tar' => 'Tar', + 'Theme' => 'Theme', 'to' => 'to', 'UnSelectAll' => 'Unselect all', 'UnZip' => 'UnZip', @@ -4217,7 +4230,10 @@ function lng($txt) { 'Upload' => 'Upload', 'UploadingFiles' => 'Upload Files', 'Username' => 'Username', + 'Write' => 'Write', 'You are logged in' => 'You are logged in', + 'Zero byte file! Aborting download' => 'Zero byte file! Aborting download', + 'Zip' => 'Zip', ], ]; From df12fe300503ed0684499844ea818df99e61ea42 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 23 Nov 2022 12:21:36 +0100 Subject: [PATCH 5/6] Use a separate method to retrieve translatable strings --- tinyfilemanager.php | 270 +++++++++++++++++++++++--------------------- 1 file changed, 140 insertions(+), 130 deletions(-) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index ff30f01..0882030 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -4106,135 +4106,7 @@ function lng($txt) { // English language $tr = [ - 'en' => [ - 'Access denied. IP restriction applicable' => 'Access denied. IP restriction applicable', - 'Actions' => 'Actions', - 'Advanced Search' => 'Advanced Search', - 'AdvancedEditor' => 'Advanced Editor', - 'already exists' => 'already exists', - 'AppName' => 'Tiny File Manager', - 'AppTitle' => 'File Manager', - 'Archive not created' => 'Archive not created', - 'Archive not unpacked' => 'Archive not unpacked', - 'Archive unpacked' => 'Archive unpacked', - 'Archive' => 'Archive', - 'Back' => 'Back', - 'BackUp' => 'Back Up', - //'CalculateFolderSize' => 'Calculate folder size', - 'Cancel' => 'Cancel', - 'Cannot open file! Aborting download' => 'Cannot open file! Aborting download', - 'Change' => 'Change', - 'ChangePermissions' => 'Change Permissions', - //'Check Latest Version' => 'Check Latest Version', - 'Copied from' => 'Copied from', - 'Copy' => 'Copy', - 'Copying' => 'Copying', - 'CopyTo' => 'Copy to', - 'Create archive?' => 'Create archive?', - 'Created' => 'Created', - 'CreateNewItem' => 'Create New Item', - 'CreateNow' => 'Create Now', - 'dark' => 'dark', - 'Delete selected files and folders?' => 'Delete selected files and folders?', - 'Delete' => 'Delete', - 'Deleted' => 'Deleted', - 'DestinationFolder' => 'Destination Folder', - 'DirectLink' => 'Direct link', - 'Download' => 'Download', - 'Edit' => 'Edit', - 'Error while copying from' => 'Error while copying from', - 'Error while deleting items' => 'Error while deleting items', - 'Error while fetching archive info' => 'Error while fetching archive info', - 'Error while moving from' => 'Error while moving from', - 'Error while renaming from' => 'Error while renaming from', - 'ErrorReporting' => 'Error Reporting', - 'Execute' => 'Execute', - 'FILE EXTENSION HAS NOT SUPPORTED' => 'FILE EXTENSION HAS NOT SUPPORTED', - 'File extension is not allowed' => 'File extension is not allowed', - 'File not found' => 'File not found', - 'File or folder with this path already exists' => 'File or folder with this path already exists', - 'File Saved Successfully' => 'File Saved Successfully', - 'File' => 'File', - 'Files' => 'Files', - 'Filter' => 'Filter', - 'Folder is empty' => 'Folder is empty', - 'Folder' => 'Folder', - //'Free of' => 'Free of', - //'FreeOf' => 'free of', - 'FullSize' => 'Full Size', - 'Generate new password hash' => 'Generate new password hash', - 'Generate' => 'Generate', - 'Group' => 'Group', - 'Help Documents' => 'Help Documents', - 'Help' => 'Help', - 'HideColumns' => 'Hide Perms/Owner columns', - 'Invalid characters in file name' => 'Invalid characters in file name', - 'Invalid characters in file or folder name' => 'Invalid characters in file or folder name', - 'Invalid file or folder name' => 'Invalid file or folder name', - 'Invalid Token.' => 'Invalid Token.', - 'InvertSelection' => 'Invert Selection', - 'ItemName' => 'Item Name', - 'ItemType' => 'Item Type', - 'Language' => 'Language', - 'light' => 'light', - 'Login failed. Invalid username or password' => 'Login failed. Invalid username or password', - 'Login' => 'Sign in', - 'Logout' => 'Sign Out', - 'Modified' => 'Modified', - 'Move' => 'Move', - 'Move' => 'Move', - 'Moved from' => 'Moved from', - 'Name' => 'Name', - 'NewItem' => 'New Item', - 'NormalEditor' => 'Normal Editor', - 'not created' => 'not created', - 'not deleted' => 'not deleted', - 'not found!' => 'not found!', - 'Nothing selected' => 'Nothing selected', - 'Open' => 'Open', - 'Operations with archives are not available' => 'Operations with archives are not available', - 'Other' => 'Other', - 'Owner' => 'Owner', - //'PartitionSize' => 'Partition size', - 'Password' => 'Password', - 'password_hash not supported, Upgrade PHP version' => 'password_hash not supported, Upgrade PHP version', - 'Paths must be not equal' => 'Paths must be not equal', - 'Permissions changed' => 'Permissions changed', - 'Permissions not changed' => 'Permissions not changed', - 'Perms' => 'Perms', - //'Preview' => 'Preview', - 'Read' => 'Read', - //'RememberMe' => 'Remember Me', - 'Rename' => 'Rename', - 'Renamed from' => 'Renamed from', - 'Report Issue' => 'Report Issue', - 'Root path' => 'Root path', - 'Save' => 'Save', - 'Saved Successfully' => 'Saved Successfully', - 'Search file in folder and subfolders...' => 'Search file in folder and subfolders...', - 'Search' => 'Search', - 'Select folder' => 'Select folder', - 'SelectAll' => 'Select all', - 'Selected files and folder deleted' => 'Selected files and folder deleted', - 'Settings' => 'Settings', - 'ShowHiddenFiles' => 'Show Hidden Files', - 'Size' => 'Size', - 'Source path not defined' => 'Source path not defined', - 'SourceFolder' => 'Source Folder', - 'Tar' => 'Tar', - 'Theme' => 'Theme', - 'to' => 'to', - 'UnSelectAll' => 'Unselect all', - 'UnZip' => 'UnZip', - 'UnZipToFolder' => 'UnZip to folder', - 'Upload' => 'Upload', - 'UploadingFiles' => 'Upload Files', - 'Username' => 'Username', - 'Write' => 'Write', - 'You are logged in' => 'You are logged in', - 'Zero byte file! Aborting download' => 'Zero byte file! Aborting download', - 'Zip' => 'Zip', - ], + 'en' => getTranslatableStrings(), ]; $i18n = fm_get_translations($tr); @@ -4246,4 +4118,142 @@ function lng($txt) { else return "$txt"; } -?> +/** + * Get the translatable strings. + * + * @return array array keys are the subject of the lng() function, values are the English strings. + */ +function getTranslatableStrings() +{ + static $strings = [ + 'Access denied. IP restriction applicable' => 'Access denied. IP restriction applicable', + 'Actions' => 'Actions', + 'Advanced Search' => 'Advanced Search', + 'AdvancedEditor' => 'Advanced Editor', + 'already exists' => 'already exists', + 'AppName' => 'Tiny File Manager', + 'AppTitle' => 'File Manager', + 'Archive not created' => 'Archive not created', + 'Archive not unpacked' => 'Archive not unpacked', + 'Archive unpacked' => 'Archive unpacked', + 'Archive' => 'Archive', + 'Back' => 'Back', + 'BackUp' => 'Back Up', + //'CalculateFolderSize' => 'Calculate folder size', + 'Cancel' => 'Cancel', + 'Cannot open file! Aborting download' => 'Cannot open file! Aborting download', + 'Change' => 'Change', + 'ChangePermissions' => 'Change Permissions', + //'Check Latest Version' => 'Check Latest Version', + 'Copied from' => 'Copied from', + 'Copy' => 'Copy', + 'Copying' => 'Copying', + 'CopyTo' => 'Copy to', + 'Create archive?' => 'Create archive?', + 'Created' => 'Created', + 'CreateNewItem' => 'Create New Item', + 'CreateNow' => 'Create Now', + 'dark' => 'dark', + 'Delete selected files and folders?' => 'Delete selected files and folders?', + 'Delete' => 'Delete', + 'Deleted' => 'Deleted', + 'DestinationFolder' => 'Destination Folder', + 'DirectLink' => 'Direct link', + 'Download' => 'Download', + 'Edit' => 'Edit', + 'Error while copying from' => 'Error while copying from', + 'Error while deleting items' => 'Error while deleting items', + 'Error while fetching archive info' => 'Error while fetching archive info', + 'Error while moving from' => 'Error while moving from', + 'Error while renaming from' => 'Error while renaming from', + 'ErrorReporting' => 'Error Reporting', + 'Execute' => 'Execute', + 'FILE EXTENSION HAS NOT SUPPORTED' => 'FILE EXTENSION HAS NOT SUPPORTED', + 'File extension is not allowed' => 'File extension is not allowed', + 'File not found' => 'File not found', + 'File or folder with this path already exists' => 'File or folder with this path already exists', + 'File Saved Successfully' => 'File Saved Successfully', + 'File' => 'File', + 'Files' => 'Files', + 'Filter' => 'Filter', + 'Folder is empty' => 'Folder is empty', + 'Folder' => 'Folder', + //'Free of' => 'Free of', + //'FreeOf' => 'free of', + 'FullSize' => 'Full Size', + 'Generate new password hash' => 'Generate new password hash', + 'Generate' => 'Generate', + 'Group' => 'Group', + 'Help Documents' => 'Help Documents', + 'Help' => 'Help', + 'HideColumns' => 'Hide Perms/Owner columns', + 'Invalid characters in file name' => 'Invalid characters in file name', + 'Invalid characters in file or folder name' => 'Invalid characters in file or folder name', + 'Invalid file or folder name' => 'Invalid file or folder name', + 'Invalid Token.' => 'Invalid Token.', + 'InvertSelection' => 'Invert Selection', + 'ItemName' => 'Item Name', + 'ItemType' => 'Item Type', + 'Language' => 'Language', + 'light' => 'light', + 'Login failed. Invalid username or password' => 'Login failed. Invalid username or password', + 'Login' => 'Sign in', + 'Logout' => 'Sign Out', + 'Modified' => 'Modified', + 'Move' => 'Move', + 'Move' => 'Move', + 'Moved from' => 'Moved from', + 'Name' => 'Name', + 'NewItem' => 'New Item', + 'NormalEditor' => 'Normal Editor', + 'not created' => 'not created', + 'not deleted' => 'not deleted', + 'not found!' => 'not found!', + 'Nothing selected' => 'Nothing selected', + 'Open' => 'Open', + 'Operations with archives are not available' => 'Operations with archives are not available', + 'Other' => 'Other', + 'Owner' => 'Owner', + //'PartitionSize' => 'Partition size', + 'Password' => 'Password', + 'password_hash not supported, Upgrade PHP version' => 'password_hash not supported, Upgrade PHP version', + 'Paths must be not equal' => 'Paths must be not equal', + 'Permissions changed' => 'Permissions changed', + 'Permissions not changed' => 'Permissions not changed', + 'Perms' => 'Perms', + //'Preview' => 'Preview', + 'Read' => 'Read', + //'RememberMe' => 'Remember Me', + 'Rename' => 'Rename', + 'Renamed from' => 'Renamed from', + 'Report Issue' => 'Report Issue', + 'Root path' => 'Root path', + 'Save' => 'Save', + 'Saved Successfully' => 'Saved Successfully', + 'Search file in folder and subfolders...' => 'Search file in folder and subfolders...', + 'Search' => 'Search', + 'Select folder' => 'Select folder', + 'SelectAll' => 'Select all', + 'Selected files and folder deleted' => 'Selected files and folder deleted', + 'Settings' => 'Settings', + 'ShowHiddenFiles' => 'Show Hidden Files', + 'Size' => 'Size', + 'Source path not defined' => 'Source path not defined', + 'SourceFolder' => 'Source Folder', + 'Tar' => 'Tar', + 'Theme' => 'Theme', + 'to' => 'to', + 'UnSelectAll' => 'Unselect all', + 'UnZip' => 'UnZip', + 'UnZipToFolder' => 'UnZip to folder', + 'Upload' => 'Upload', + 'UploadingFiles' => 'Upload Files', + 'Username' => 'Username', + 'Write' => 'Write', + 'You are logged in' => 'You are logged in', + 'Zero byte file! Aborting download' => 'Zero byte file! Aborting download', + 'Zip' => 'Zip', + ]; + + return $strings; +} From f493dc62d9909165aef403710667e56045686527 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Wed, 23 Nov 2022 14:29:49 +0100 Subject: [PATCH 6/6] Remove duplicated string It was defined twice in the original code --- tinyfilemanager.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tinyfilemanager.php b/tinyfilemanager.php index 0882030..63b5a94 100644 --- a/tinyfilemanager.php +++ b/tinyfilemanager.php @@ -4201,7 +4201,6 @@ function getTranslatableStrings() 'Logout' => 'Sign Out', 'Modified' => 'Modified', 'Move' => 'Move', - 'Move' => 'Move', 'Moved from' => 'Moved from', 'Name' => 'Name', 'NewItem' => 'New Item',