phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 20:10:08 +02:00
Code Releases Activity

👌 Localisation improvements

Browse Source
This commit is contained in:
Nico Verbruggen
2022-01-25 18:28:10 +01:00
parent 20959501c9
commit 0f0e91273e
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpmon-common/PHP/PHP Version/PhpEnv.swift
View File

@ -149,8 +149,10 @@ class PhpEnv {
}
public func validVersions(for constraint: String) -> [PhpVersionNumber] {
return PhpVersionNumberCollection
.make(from: self.availablePhpVersions)
.matching(constraint: constraint)
constraint.split(separator: "|").flatMap {
return PhpVersionNumberCollection
.make(from: self.availablePhpVersions)
.matching(constraint: $0.trimmingCharacters(in: .whitespacesAndNewlines))
}
}
}

2
phpmon/Domain/Integrations/Composer/ComposerJson.swift
View File

@ -21,7 +21,7 @@ struct ComposerJson: Decodable {
// Check if in dependencies
if dependencies?["php"] != nil {
return (dependencies!["php"]!, "dependency list")
return (dependencies!["php"]!, "require")
}
// Unknown!

8
phpmon/Domain/SiteList/SiteListCell.swift
View File

@ -87,19 +87,17 @@ class SiteListCell: NSTableCellView
alert.informativeText = "alert.composer_php_requirement.info"
.localized(site.composerPhpSource)
alert.addButton(withTitle: "Close")
alert.addButton(withTitle: "site_link.close".localized)
var mapIndex: Int = NSApplication.ModalResponse.alertSecondButtonReturn.rawValue
var map: [Int: String] = [:]
// Determine which installed versions would be ideal to switch to,
// but make sure to exclude the currently linked version
site.composerPhp.split(separator: "|").flatMap { string in
return PhpEnv.shared.validVersions(for: string.trimmingCharacters(in: .whitespacesAndNewlines))
}.filter({ version in
PhpEnv.shared.validVersions(for: site.composerPhp).filter({ version in
version.homebrewVersion != PhpEnv.phpInstall.version.short
}).forEach { version in
alert.addButton(withTitle: "Switch to PHP \(version.homebrewVersion)")
alert.addButton(withTitle: "site_link.switch_to_php".localized(version.homebrewVersion))
map[mapIndex] = version.homebrewVersion
mapIndex += 1
}

15
phpmon/Localizable.strings
View File

@ -69,6 +69,17 @@
"site_list.confirm_unlink" = "Are you sure you want to unlink '%@'?";
"site_link.confirm_link" = "No files will be removed. If needed, the site will need to be relinked via the command line.";
"site_link.close" = "Close";
"site_link.switch_to_php" = "Switch to PHP %@";
// ADD SITE TO SITE LIST
"site_list.add.link_folder" = "Link a Folder";
"site_list.add.domain_name_placeholder" = "Enter a domain name here";
"site_list.add.secure_after_creation" = "Secure %@.%@ after creation";
"site_list.add.secure_description" = "Securing a site requires administrative privileges.\nYou will be prompted for your password or Touch ID.";
"site_list.add.create_link" = "Create Link";
"site_list.add.cancel" = "Cancel";
"site_list.add.folder_available" = "This site will be available via the following URL: %@://%@.%@";
// SITE LIST ACTIONS
@ -153,8 +164,8 @@ problem manually, using your own Terminal app (this just shows you the output)."
"alert.composer_success.info" = "Your global Composer dependencies have been successfully updated.";
// Composer Version
"alert.composer_php_requirement.title" = "`%@` has the following PHP requirement: \"php\": \"%@\".";
"alert.composer_php_requirement.info" = "This required PHP version was determined by checking the %@ in `composer.json` when the list was last refreshed.";
"alert.composer_php_requirement.title" = "`%@` has the following PHP requirement: \"php\":\n\"%@\".";
"alert.composer_php_requirement.info" = "This required PHP version was determined by checking the `%@` field in the `composer.json` file when the site list was last refreshed.";
// Force Reload Started
"alert.force_reload.title" = "PHP Monitor will force reload the latest version of PHP";