Skip to content

Commit

Permalink
Merge pull request #483 from ooni/ux/remove-tested-since
Browse files Browse the repository at this point in the history
Remove tested since date on country pages
  • Loading branch information
sarathms authored Sep 15, 2020
2 parents 1779094 + c58891a commit 2e2c9ab
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 26 deletions.
35 changes: 12 additions & 23 deletions components/country/IntlHead.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { useIntl } from 'react-intl'
const IntlHead = ({
countryName,
measurementCount,
measuredSince,
networkCount
}) => {
const intl = useIntl()
Expand All @@ -15,32 +14,22 @@ const IntlHead = ({
<meta
key="og:title"
property="og:title"
content={intl.formatMessage(
{
id: 'Country.Overview.MetaTitle',
defaultMessage: 'Internet Censorship in {countryName} - OONI Explorer'
},
{
countryName
}
)}
content={intl.formatMessage({
id: 'Country.Meta.Title',
},{
countryName
})}
/>
<meta
key="og:description"
property="og:description"
content={intl.formatMessage(
{
id: 'Country.Overview.MetaDescription',
defaultMessage:
'Since {startDate}, OONI Probe users in {countryName} have collected {measurementCount} measurements from {networkCount} local networks. Explore the data on OONI Explorer'
},
{
measurementCount: intl.formatNumber(measurementCount),
countryName,
startDate: intl.formatDate(measuredSince),
networkCount: intl.formatNumber(networkCount)
}
)}
content={intl.formatMessage({
id: 'Country.Meta.Description',
},{
measurementCount: intl.formatNumber(measurementCount),
countryName,
networkCount: intl.formatNumber(networkCount)
})}
/>
</Head>
)
Expand Down
1 change: 0 additions & 1 deletion components/country/Overview.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ const Overview = ({
values={{
measurementCount: intl.formatNumber(measurementCount),
countryName,
startDate: intl.formatDate(measuredSince),
networkCovered: intl.formatNumber(networkCount)
}}
/>
Expand Down
4 changes: 3 additions & 1 deletion static/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,13 @@
"Country.Overview.TestsByClass.Circumvention": "Circumvention Tools",
"Country.Overview.FeaturedResearch": "Research Reports",
"Country.Overview.FeaturedResearch.None": "We haven't published a research report based on OONI data from this country yet. \n\nWe encourage you to use OONI data for your research!",
"Country.Overview.SummaryTextTemplate": "Since **{startDate}**, OONI Probe users in **{countryName}** have collected **{measurementCount}** measurements from **{networkCovered}** local networks.\n\nExplore the data below to check the accessibility and/or blocking of sites and services.",
"Country.Overview.SummaryTextTemplate": "OONI Probe users in **{countryName}** have collected **{measurementCount}** measurements from **{networkCovered}** local networks.\n\nExplore the data below to check the accessibility and/or blocking of sites and services.",
"Country.Overview.NoData.Title": "Let's collect more data!",
"Country.Overview.NoData.CallToAction": "We don\u2019t have enough measurements for **{country}** to show a chart. If you are in {country} or know people there, tell them to run OONI Probe to collect more measurements.",
"Country.Overview.NoData.Button.InstallProbe": "Install OONI Probe",
"Country.Overview.NoData.Button.OoniRunLink": "Create OONI Run Link",
"Country.Meta.Title": "Internet Censorship in {countryName} - OONI Explorer",
"Country.Meta.Description": "OONI Probe users in {countryName} have collected {measurementCount} measurements from {networkCount} local networks. Explore the data on OONI Explorer.",
"Country.PeriodFilter.Label": "Show results from",
"Country.PeriodFilter.Option.30Days": "Last 30 Days",
"Country.PeriodFilter.Option.2Months": "Last 2 Months",
Expand Down
2 changes: 1 addition & 1 deletion static/lang/translations.js

Large diffs are not rendered by default.

0 comments on commit 2e2c9ab

Please sign in to comment.