diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json index b4e271824a..8127dbf4b9 100644 --- a/options/locale_next/locale_en-US.json +++ b/options/locale_next/locale_en-US.json @@ -271,11 +271,12 @@ "packages.dependency.id": "ID", "packages.dependency.version": "Version", "packages.search_in_external_registry": "Search in %s", + "packages.common.install": "To install the package, run the following command:", + "packages.common.registry": "Setup this registry from the command line:", + "packages.common.repository": "Repository info", "packages.alpine.registry": "Setup this registry by adding the url in your /etc/apk/repositories file:", "packages.alpine.registry.key": "Download the registry public RSA key into the /etc/apk/keys/ folder to verify the index signature:", "packages.alpine.registry.info": "Choose $branch and $repository from the list below.", - "packages.alpine.install": "To install the package, run the following command:", - "packages.alpine.repository": "Repository info", "packages.alpine.repository.branches": "Branches", "packages.alpine.repository.repositories": "Repositories", "packages.alpine.repository.architectures": "Architectures", @@ -288,22 +289,18 @@ "packages.arch.version.description": "Description", "packages.arch.version.provides": "Provides", "packages.arch.version.groups": "Group", - "packages.arch.version.depends": "Depends", - "packages.arch.version.optdepends": "Optional depends", - "packages.arch.version.makedepends": "Make depends", - "packages.arch.version.checkdepends": "Check depends", + "packages.arch.version.optdepends": "Optional dependencies", + "packages.arch.version.makedepends": "Make dependencies", + "packages.arch.version.checkdepends": "Check dependencies", "packages.arch.version.conflicts": "Conflicts", "packages.arch.version.replaces": "Replaces", "packages.arch.version.backup": "Backup", "packages.cargo.registry": "Setup this registry in the Cargo configuration file (for example ~/.cargo/config.toml):", "packages.cargo.install": "To install the package using Cargo, run the following command:", "packages.chef.registry": "Setup this registry in your ~/.chef/config.rb file:", - "packages.chef.install": "To install the package, run the following command:", "packages.composer.registry": "Setup this registry in your ~/.composer/config.json file:", "packages.composer.install": "To install the package using Composer, run the following command:", - "packages.composer.dependencies": "Dependencies", "packages.composer.dependencies.development": "Development dependencies", - "packages.conan.registry": "Setup this registry from the command line:", "packages.conan.install": "To install the package using Conan, run the following command:", "packages.conda.registry": "Setup this registry as a Conda repository in your .condarc file:", "packages.conda.install": "To install the package using Conda, run the following command:", @@ -318,29 +315,21 @@ "packages.container.labels.key": "Key", "packages.container.labels.value": "Value", "packages.cran.registry": "Setup this registry in your Rprofile.site file:", - "packages.cran.install": "To install the package, run the following command:", - "packages.debian.registry": "Setup this registry from the command line:", "packages.debian.registry.info": "Choose $distribution and $component from the list below.", - "packages.debian.install": "To install the package, run the following command:", - "packages.debian.repository": "Repository info", "packages.debian.repository.distributions": "Distributions", "packages.debian.repository.components": "Components", "packages.debian.repository.architectures": "Architectures", "packages.generic.download": "Download package from the command line:", "packages.go.install": "Install the package from the command line:", - "packages.helm.registry": "Setup this registry from the command line:", - "packages.helm.install": "To install the package, run the following command:", "packages.maven.registry": "Setup this registry in your project pom.xml file:", "packages.maven.install": "To use the package include the following in the dependencies block in the pom.xml file:", "packages.maven.install2": "Run via command line:", "packages.maven.download": "To download the dependency, run via command line:", - "packages.nuget.registry": "Setup this registry from the command line:", "packages.nuget.install": "To install the package using NuGet, run the following command:", "packages.nuget.dependency.framework": "Target Framework", "packages.npm.registry": "Setup this registry in your project .npmrc file:", "packages.npm.install": "To install the package using npm, run the following command:", "packages.npm.install2": "or add it to the package.json file:", - "packages.npm.dependencies": "Dependencies", "packages.npm.dependencies.development": "Development dependencies", "packages.npm.dependencies.bundle": "Bundled dependencies", "packages.npm.dependencies.peer": "Peer dependencies", @@ -348,18 +337,12 @@ "packages.npm.details.tag": "Tag", "packages.pypi.requires": "Requires Python", "packages.pypi.install": "To install the package using pip, run the following command:", - "packages.rpm.registry": "Setup this registry from the command line:", "packages.rpm.distros.redhat": "on RedHat based distributions", "packages.rpm.distros.suse": "on SUSE based distributions", - "packages.rpm.install": "To install the package, run the following command:", - "packages.rpm.repository": "Repository info", "packages.rpm.repository.architectures": "Architectures", "packages.rpm.repository.multiple_groups": "This package is available in multiple groups.", - "packages.alt.registry": "Setup this registry from the command line:", - "packages.alt.registry.install": "To install the package, run the following command:", "packages.alt.install": "Install package", "packages.alt.setup": "Add a repository to the list of connected repositories (choose the necessary architecture instead of \"_arch_\"):", - "packages.alt.repository": "Repository info", "packages.alt.repository.architectures": "Architectures", "packages.alt.repository.multiple_groups": "This package is available in multiple groups.", "packages.rubygems.install": "To install the package using gem, run the following command:", @@ -368,7 +351,6 @@ "packages.rubygems.dependencies.development": "Development dependencies", "packages.rubygems.required.ruby": "Requires Ruby version", "packages.rubygems.required.rubygems": "Requires RubyGem version", - "packages.swift.registry": "Setup this registry from the command line:", "packages.swift.install": "Add the package in your Package.swift file:", "packages.swift.install2": "and run the following command:", "packages.vagrant.install": "To add a Vagrant box, run the following command:", diff --git a/templates/package/content/alpine.tmpl b/templates/package/content/alpine.tmpl index 8914006ff0..a4a516166b 100644 --- a/templates/package/content/alpine.tmpl +++ b/templates/package/content/alpine.tmpl @@ -12,7 +12,7 @@ 
curl -JO
- + 
sudo apk add {{$.PackageDescriptor.Package.Name}}={{$.PackageDescriptor.Version.Version}}
@@ -23,7 +23,7 @@
-

{{ctx.Locale.Tr "packages.alpine.repository"}}

+

{{ctx.Locale.Tr "packages.common.repository"}}

diff --git a/templates/package/content/alt.tmpl b/templates/package/content/alt.tmpl index 0a5c328e6d..5f74fb704e 100644 --- a/templates/package/content/alt.tmpl +++ b/templates/package/content/alt.tmpl @@ -3,7 +3,7 @@
- + 
{{- if gt (len .Groups) 1 -}}
 # {{ctx.Locale.Tr "packages.alt.repository.multiple_groups"}}
 
@@ -18,7 +18,7 @@ apt-repo add rpm 
 				
 				

-					
# {{ctx.Locale.Tr "packages.alt.registry.install"}}
+					
# {{ctx.Locale.Tr "packages.common.install"}}
 apt-get update
 apt-get install {{$.PackageDescriptor.Package.Name}}

 				

@@ -29,7 +29,7 @@ apt-get install {{$.PackageDescriptor.Package.Name}}
-

{{ctx.Locale.Tr "packages.alt.repository"}}

+

{{ctx.Locale.Tr "packages.common.repository"}}

diff --git a/templates/package/content/arch.tmpl b/templates/package/content/arch.tmpl index 6a041d323b..b3d4094528 100644 --- a/templates/package/content/arch.tmpl +++ b/templates/package/content/arch.tmpl @@ -77,7 +77,7 @@ Server = -
{{ctx.Locale.Tr "packages.arch.version.depends"}}
+
{{ctx.Locale.Tr "packages.dependencies"}}
 diff --git a/templates/package/content/chef.tmpl b/templates/package/content/chef.tmpl index d39164b90b..9d91c30833 100644 --- a/templates/package/content/chef.tmpl +++ b/templates/package/content/chef.tmpl @@ -7,7 +7,7 @@ 
knife[:supermarket_site] = ''
- + 
knife supermarket install {{.PackageDescriptor.Package.Name}} {{.PackageDescriptor.Version.Version}}
diff --git a/templates/package/content/composer.tmpl b/templates/package/content/composer.tmpl index 73ab3ac7cc..2439f6434a 100644 --- a/templates/package/content/composer.tmpl +++ b/templates/package/content/composer.tmpl @@ -33,7 +33,7 @@

{{ctx.Locale.Tr "packages.dependencies"}}

- {{template "package/content/composer_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Require "title" (ctx.Locale.Tr "packages.composer.dependencies")}} + {{template "package/content/composer_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Require "title" (ctx.Locale.Tr "packages.dependencies")}} {{template "package/content/composer_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.RequireDev "title" (ctx.Locale.Tr "packages.composer.dependencies.development")}}
diff --git a/templates/package/content/conan.tmpl b/templates/package/content/conan.tmpl index 8ebc258e31..8553ff3ef7 100644 --- a/templates/package/content/conan.tmpl +++ b/templates/package/content/conan.tmpl @@ -3,7 +3,7 @@
- + 
conan remote add forgejo
diff --git a/templates/package/content/cran.tmpl b/templates/package/content/cran.tmpl index df7a48c3d6..f761618f22 100644 --- a/templates/package/content/cran.tmpl +++ b/templates/package/content/cran.tmpl @@ -7,7 +7,7 @@ 
options("repos" = c(getOption("repos"), c(forgejo="")))
- + 
install.packages("{{.PackageDescriptor.Package.Name}}")
diff --git a/templates/package/content/debian.tmpl b/templates/package/content/debian.tmpl index 782ac1c8b3..f3ca23a6fe 100644 --- a/templates/package/content/debian.tmpl +++ b/templates/package/content/debian.tmpl @@ -3,14 +3,14 @@
- + 
sudo curl  -o /etc/apt/keyrings/forgejo-{{$.PackageDescriptor.Owner.Name}}.asc
 echo "deb [signed-by=/etc/apt/keyrings/forgejo-{{$.PackageDescriptor.Owner.Name}}.asc]  $distribution $component" | sudo tee -a /etc/apt/sources.list.d/forgejo.list
 sudo apt update

{{ctx.Locale.Tr "packages.debian.registry.info"}}

- + 
sudo apt install {{$.PackageDescriptor.Package.Name}}={{$.PackageDescriptor.Version.Version}}
@@ -21,7 +21,7 @@ sudo apt update
-

{{ctx.Locale.Tr "packages.debian.repository"}}

+

{{ctx.Locale.Tr "packages.common.repository"}}

{{StringUtils.Join $.PackageDescriptor.Metadata.Depends ", "}}
diff --git a/templates/package/content/helm.tmpl b/templates/package/content/helm.tmpl index 9d8555597e..4fceff4f72 100644 --- a/templates/package/content/helm.tmpl +++ b/templates/package/content/helm.tmpl @@ -3,12 +3,12 @@
- + 
helm repo add {{AppDomain}} 
 helm repo update
- + 
helm install {{.PackageDescriptor.Package.Name}} {{AppDomain}}/{{.PackageDescriptor.Package.Name}}
diff --git a/templates/package/content/npm.tmpl b/templates/package/content/npm.tmpl index 1ffbd199e3..3c2e1afb9a 100644 --- a/templates/package/content/npm.tmpl +++ b/templates/package/content/npm.tmpl @@ -37,7 +37,7 @@

{{ctx.Locale.Tr "packages.dependencies"}}

- {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Dependencies "title" (ctx.Locale.Tr "packages.npm.dependencies")}} + {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.Dependencies "title" (ctx.Locale.Tr "packages.dependencies")}} {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.DevelopmentDependencies "title" (ctx.Locale.Tr "packages.npm.dependencies.development")}} {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.PeerDependencies "title" (ctx.Locale.Tr "packages.npm.dependencies.peer")}} {{template "package/content/npm_dependencies" dict "root" $ "dependencies" .PackageDescriptor.Metadata.OptionalDependencies "title" (ctx.Locale.Tr "packages.npm.dependencies.optional")}} diff --git a/templates/package/content/nuget.tmpl b/templates/package/content/nuget.tmpl index c8568845f1..96ceb9d2b2 100644 --- a/templates/package/content/nuget.tmpl +++ b/templates/package/content/nuget.tmpl @@ -3,7 +3,7 @@
- + 
dotnet nuget add source --name {{.PackageDescriptor.Owner.Name}} --username your_username --password your_token
diff --git a/templates/package/content/rpm.tmpl b/templates/package/content/rpm.tmpl index f5d56623ac..8d79b3f24e 100644 --- a/templates/package/content/rpm.tmpl +++ b/templates/package/content/rpm.tmpl @@ -3,7 +3,7 @@
- + 
{{- if gt (len .Groups) 1 -}}
 # {{ctx.Locale.Tr "packages.rpm.repository.multiple_groups"}}
 
@@ -21,7 +21,7 @@ zypper addrepo 
-				
+				
 				

 					
# {{ctx.Locale.Tr "packages.rpm.distros.redhat"}}
 dnf install {{$.PackageDescriptor.Package.Name}}
@@ -36,7 +36,7 @@ zypper install {{$.PackageDescriptor.Package.Name}}
-

{{ctx.Locale.Tr "packages.rpm.repository"}}

+

{{ctx.Locale.Tr "packages.common.repository"}}

diff --git a/templates/package/content/swift.tmpl b/templates/package/content/swift.tmpl index 68db444883..25c558dd2f 100644 --- a/templates/package/content/swift.tmpl +++ b/templates/package/content/swift.tmpl @@ -3,7 +3,7 @@
- + 
swift package-registry set