Skip to content
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

Jump to bottom

Rephrase package removed #1095

Merged
merged 5 commits into from Nov 7, 2020
Merged

Rephrase package removed #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53293e7
Rephrase package removed
MDrakos Nov 7, 2020
09cbea2
Merge branch 'master' into rephrase-175605839
MDrakos Nov 7, 2020
4f13379
Fix another conflict
MDrakos Nov 7, 2020
7c0a35c
Fix bad merge
MDrakos Nov 7, 2020
89f1e7a
Fix another bad merge
MDrakos Nov 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions locale/en-us.yaml
View file
Open in desktop
Expand Up @@ -1136,17 +1136,17 @@ package_headless_added:
package_headless_updated:
other: "Package updated: [NOTICE]{{.V0}}[/RESET]"
package_headless_removed:
other: "Package removed: [NOTICE]{{.V0}}[/RESET]"
other: "Package uninstalled: [NOTICE]{{.V0}}[/RESET]"
err_package_removed:
other: Failed to remove package
err_bundle_removed:
other: Failed to remove bundle
err_packages_removed:
other: Failed to remove packages
package_removed:
other: "Package removed: [NOTICE]{{.V0}}[/RESET]"
other: "Package uninstalled: [NOTICE]{{.V0}}[/RESET]"
bundle_removed:
other: "Bundle removed: [NOTICE]{{.V0}}[/RESET]"
other: "Bundle uninstalled: [NOTICE]{{.V0}}[/RESET]"
update_config:
other: To ensure your local project is synchronized with the ActiveState platform please use `[ACTIONABLE]state pull[/RESET]`
package_update_config_file:
Expand Down
4 changes: 2 additions & 2 deletions test/integration/package_int_test.go
View file
Open in desktop
Expand Up @@ -317,7 +317,7 @@ func (suite *PackageIntegrationTestSuite) TestPackage_headless_operation() {

suite.Run("uninstall", func() {
cp := ts.Spawn("uninstall", "dateparser")
cp.ExpectRe("(?:Package removed|project is currently building)")
cp.ExpectRe("(?:package uninstalled|project is currently building)")
cp.Wait()
})
}
Expand Down Expand Up @@ -361,7 +361,7 @@ func (suite *PackageIntegrationTestSuite) TestPackage_operation() {

suite.Run("uninstall", func() {
cp := ts.Spawn("uninstall", "dateparser")
cp.ExpectRe("(?:Package removed|project is currently building)")
cp.ExpectRe("(?:package uninstalled|project is currently building)")
cp.Wait()
})

Expand Down