Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update "MacOS" text to "macOS"

This commit is contained in:
rht 2017-08-26 09:33:47 +02:00 committed by Tim Abbott
parent c4915aaff9
commit 437b2a3146
25 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/screenshot-and-gif-software.md
View File

@ -9,7 +9,7 @@ to checkout your branch.
### Browser ### Browser
- [LightShot Screenshot](https://app.prntscr.com/en/index.html) (Chrome, Firefox, IE & Opera) - [LightShot Screenshot](https://app.prntscr.com/en/index.html) (Chrome, Firefox, IE & Opera)
### MacOS ### macOS
- Command-Shift-3 to capture all of the screen - Command-Shift-3 to capture all of the screen
- Command-Shift-4 and drag cursor to select a specific area - Command-Shift-4 and drag cursor to select a specific area
- [LightShot Screenshot](https://app.prntscr.com/en/index.html) - [LightShot Screenshot](https://app.prntscr.com/en/index.html)
@ -29,7 +29,7 @@ to checkout your branch.
- [Chrome Capture](https://chrome.google.com/webstore/detail/chrome-capture/ggaabchcecdbomdcnbahdfddfikjmphe?hl=en) - [Chrome Capture](https://chrome.google.com/webstore/detail/chrome-capture/ggaabchcecdbomdcnbahdfddfikjmphe?hl=en)
(Tip: Use Alt+i to interact with the page while recording) (Tip: Use Alt+i to interact with the page while recording)
### MacOS ### macOS
- [GIPHY](https://giphy.com/apps/giphycapture) - [GIPHY](https://giphy.com/apps/giphycapture)
- [GIF Brewery](http://gifbrewery.com/) - [GIF Brewery](http://gifbrewery.com/)
- [Gyazo GIF](https://gyazo.com/en) - [Gyazo GIF](https://gyazo.com/en)

4
static/js/portico/landing-page.js
View File

@ -49,8 +49,8 @@ var apps_events = function () {
}, },
mac: { mac: {
image: "/static/images/landing-page/macbook.png", image: "/static/images/landing-page/macbook.png",
alt: "MacOS", alt: "macOS",
description: "Zulip on MacOS is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.", description: "Zulip on macOS is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.",
link: ELECTRON_APP_URL_MAC, link: ELECTRON_APP_URL_MAC,
}, },
android: { android: {

2
static/locale/bg/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

4
static/locale/cs/LC_MESSAGES/django.po
View File

@ -148,8 +148,8 @@ msgid "Zulip Android"
msgstr "Zulip Android" msgstr "Zulip Android"
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "MacOS" msgstr "macOS"
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118
msgid "Windows" msgid "Windows"

4
static/locale/de/LC_MESSAGES/django.po
View File

@ -156,8 +156,8 @@ msgid "Zulip Android"
msgstr "Zulip Android" msgstr "Zulip Android"
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "MacOS" msgstr "macOS"
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118
msgid "Windows" msgid "Windows"

4
static/locale/es/LC_MESSAGES/django.po
View File

@ -150,8 +150,8 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "MacOS" msgstr "macOS"
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118
msgid "Windows" msgid "Windows"

2
static/locale/fr/LC_MESSAGES/django.po
View File

@ -150,7 +150,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/hi/LC_MESSAGES/django.po
View File

@ -146,7 +146,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/hu/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/it/LC_MESSAGES/django.po
View File

@ -146,7 +146,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/ja/LC_MESSAGES/django.po
View File

@ -246,7 +246,7 @@ msgid "Download now"
msgstr "" msgstr ""
#: templates/zerver/apps.html:100 #: templates/zerver/apps.html:100
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:109 #: templates/zerver/apps.html:109

2
static/locale/ko/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/ml/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/nl/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/pl/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/pt/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/ru/LC_MESSAGES/django.po
View File

@ -150,7 +150,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/sr/LC_MESSAGES/django.po
View File

@ -147,7 +147,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
static/locale/zh_Hans/LC_MESSAGES/django.po
View File

@ -163,7 +163,7 @@ msgid "Zulip Android"
msgstr "" msgstr ""
#: templates/zerver/apps.html:97 #: templates/zerver/apps.html:97
msgid "MacOS" msgid "macOS"
msgstr "" msgstr ""
#: templates/zerver/apps.html:118 #: templates/zerver/apps.html:118

2
templates/zerver/apps.html
View File

@ -44,7 +44,7 @@
<div class="apps"> <div class="apps">
<a class="no-style" href="/apps/mac"> <a class="no-style" href="/apps/mac">
<i class="icon fa fa-apple" data-label="MacOS"></i> <i class="icon fa fa-apple" data-label="macOS"></i>
</a> </a>
<a class="no-style" href="/apps/windows"> <a class="no-style" href="/apps/windows">
<i class="icon fa fa-windows" data-label="Windows"></i> <i class="icon fa fa-windows" data-label="Windows"></i>

2
templates/zerver/help/keyboard-shortcuts.md
View File

@ -15,7 +15,7 @@ Zulip keyboard shortcuts are divided into four categories:
!!! warn "" !!! warn ""
**Note:** We note how to enter keyboard shortcuts using keys not **Note:** We note how to enter keyboard shortcuts using keys not
present on the MacOS keyboard in parentheses below. present on the macOS keyboard in parentheses below.
## Navigation ## Navigation

2
templates/zerver/help/send-a-message-in-a-different-language.md
View File

@ -54,7 +54,7 @@ and then click **OK**.
pointer over this bar, a tooltip appears that describes the active pointer over this bar, a tooltip appears that describes the active
keyboard layout. keyboard layout.
## Change keyboard language on MacOS ## Change keyboard language on macOS
1. Choose **Apple menu**. 1. Choose **Apple menu**.

2
tools/lib/capitalization.py
View File

@ -28,7 +28,7 @@ IGNORED_PHRASES = [
r"JSON", r"JSON",
r"Kerberos", r"Kerberos",
r"Mac", r"Mac",
r"MacOS", r"macOS",
r"MiB", r"MiB",
r"OTP", r"OTP",
r"Pivotal", r"Pivotal",

2
zerver/signals.py
View File

@ -39,7 +39,7 @@ def get_device_os(user_agent):
if "windows" in user_agent: if "windows" in user_agent:
return "Windows" return "Windows"
elif "macintosh" in user_agent: elif "macintosh" in user_agent:
return "MacOS" return "macOS"
elif "linux" in user_agent and "android" not in user_agent: elif "linux" in user_agent and "android" not in user_agent:
return "Linux" return "Linux"
elif "android" in user_agent: elif "android" in user_agent:

4
zerver/tests/test_new_users.py
View File

@ -83,10 +83,10 @@ class TestBrowserAndOsUserAgentStrings(ZulipTestCase):
'AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10B350', None, 'iOS'), 'AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10B350', None, 'iOS'),
('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) ' + ('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) ' +
'AppleWebKit/537.36 (KHTML, like Gecko) ' + 'AppleWebKit/537.36 (KHTML, like Gecko) ' +
'Chrome/56.0.2924.87 Safari/537.36', 'Chrome', 'MacOS'), 'Chrome/56.0.2924.87 Safari/537.36', 'Chrome', 'macOS'),
('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) ' + ('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) ' +
'AppleWebKit/602.3.12 (KHTML, like Gecko) ' + 'AppleWebKit/602.3.12 (KHTML, like Gecko) ' +
'Version/10.0.2 Safari/602.3.12', 'Safari', 'MacOS'), 'Version/10.0.2 Safari/602.3.12', 'Safari', 'macOS'),
('ZulipAndroid/1.0', 'Zulip', 'Android'), ('ZulipAndroid/1.0', 'Zulip', 'Android'),
('ZulipMobile/1.0.12 (Android 7.1.1)', 'Zulip', 'Android'), ('ZulipMobile/1.0.12 (Android 7.1.1)', 'Zulip', 'Android'),
('ZulipMobile/0.7.1.1 (iOS 10.3.1)', 'Zulip', 'iOS'), ('ZulipMobile/0.7.1.1 (iOS 10.3.1)', 'Zulip', 'iOS'),