Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cypress/e2e/feed.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ describe('feed and filters', () => {
cy.signInWithEncryptedFile(backupDownloadFilePath(profile1.username));
cy.get('[data-cy="filter-reach-radiogroup"]').find('[aria-label="Following"]').click();
waitForFeedToLoad();
cy.get('[data-cy="filter-sort-radiogroup"]').find('[aria-label="Popularity"]').click();
cy.get('[data-cy="filter-sort-radiogroup"]').click();
cy.get('[role="option"][aria-label="Popularity"]').click();
waitForFeedToLoad();

// * check the posts are in the correct order
Expand Down
1 change: 1 addition & 0 deletions cypress/e2e/posts.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ describe('posts', () => {
cy.location('pathname').should('contain', '/post/');

// switch to wide layout
cy.get('[data-cy="filter-layout-dropdown"]').filter(':visible').click();
cy.get('[data-cy="wide-layout-toggle"]').filter(':visible').click();

// add three tags to post
Expand Down
3 changes: 2 additions & 1 deletion cypress/support/collections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ export const deleteCollectionFromHero = () => {

// apply a content filter (e.g. 'All', 'Collections') from the home feed sidebar
export const applyContentFilter = (label: string) => {
cy.get('[data-testid="filter-content-radiogroup"]').find(`[aria-label="${label}"]`).click();
cy.get('[data-testid="filter-content-dropdown"]').click();
cy.get(`[role="option"][aria-label="${label}"]`).click();
waitForFeedToLoad();
};

Expand Down
24 changes: 22 additions & 2 deletions messages/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -1158,10 +1158,30 @@
},
"filters": {
"reach": {
"title": "النطاق",
"title": "منشورات من",
"all": "الكل",
"network": "الشبكة",
"myNetwork": "شبكتي",
"following": "المتابَعون",
"friends": "الاصدقاء"
"friends": "الاصدقاء",
"me": "انا",
"profileTag": "وسم الملف الشخصي",
"profileTagLimitReached": "{max} وسوم كحد أقصى",
"taggedBy": "بواسطة {reach}",
"taggedByLabel": "اختر من قام بوسم هذه الملفات الشخصية",
"profileTagSummary": {
"reach": {
"all": "منشورات من أي شخص وسمه {curator} كـ {tags}",
"friends": "منشورات من الأصدقاء الذين وسمهم {curator} كـ {tags}",
"following": "منشورات من الأشخاص الذين أتابعهم ووسمهم {curator} كـ {tags}",
"network": "منشورات من أشخاص في شبكتي وسمهم {curator} كـ {tags}"
},
"curator": {
"me": "أنا",
"following": "الأشخاص الذين أتابعهم",
"network": "شبكتي"
}
}
},
"sort": {
"title": "الترتيب",
Expand Down
24 changes: 22 additions & 2 deletions messages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1164,10 +1164,30 @@
},
"filters": {
"reach": {
"title": "Reichweite",
"title": "Beiträge von",
"all": "Alle",
"network": "Netzwerk",
"myNetwork": "Mein Netzwerk",
"following": "Folge ich",
"friends": "Freunde"
"friends": "Freunde",
"me": "Ich",
"profileTag": "Profil-Tag",
"profileTagLimitReached": "max. {max} Tags",
"taggedBy": "von {reach}",
"taggedByLabel": "Auswählen, wer diese Profile markiert hat",
"profileTagSummary": {
"reach": {
"all": "Beiträge von allen, die von {curator} als {tags} markiert wurden",
"friends": "Beiträge von Freunden, die von {curator} als {tags} markiert wurden",
"following": "Beiträge von Personen, denen ich folge und die von {curator} als {tags} markiert wurden",
"network": "Beiträge von Personen in meinem Netzwerk, die von {curator} als {tags} markiert wurden"
},
"curator": {
"me": "mir",
"following": "Personen, denen ich folge",
"network": "meinem Netzwerk"
}
}
},
"sort": {
"title": "Sortieren",
Expand Down
24 changes: 22 additions & 2 deletions messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1162,10 +1162,30 @@
},
"filters": {
"reach": {
"title": "Reach",
"title": "Posts from",
"all": "All",
"network": "Network",
"myNetwork": "My Network",
"following": "Following",
"friends": "Friends"
"friends": "Friends",
"me": "Me",
"profileTag": "profile tag",
"profileTagLimitReached": "{max} tags max",
"taggedBy": "by {reach}",
"taggedByLabel": "Choose who tagged these profiles",
"profileTagSummary": {
"reach": {
"all": "Posts from anyone tagged as {tags} by {curator}",
"friends": "Posts from friends tagged as {tags} by {curator}",
"following": "Posts from people I follow tagged as {tags} by {curator}",
"network": "Posts from people in my network tagged as {tags} by {curator}"
},
"curator": {
"me": "me",
"following": "people I follow",
"network": "my network"
}
}
},
"sort": {
"title": "Sort",
Expand Down
24 changes: 22 additions & 2 deletions messages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1164,10 +1164,30 @@
},
"filters": {
"reach": {
"title": "Alcance",
"title": "Publicaciones de",
"all": "Todos",
"network": "Red",
"myNetwork": "Mi red",
"following": "Siguiendo",
"friends": "Amigos"
"friends": "Amigos",
"me": "Yo",
"profileTag": "etiqueta de perfil",
"profileTagLimitReached": "máximo {max} etiquetas",
"taggedBy": "por {reach}",
"taggedByLabel": "Elige quién etiquetó estos perfiles",
"profileTagSummary": {
"reach": {
"all": "Publicaciones de cualquiera etiquetado como {tags} por {curator}",
"friends": "Publicaciones de amigos etiquetados como {tags} por {curator}",
"following": "Publicaciones de personas que sigo etiquetadas como {tags} por {curator}",
"network": "Publicaciones de personas de mi red etiquetadas como {tags} por {curator}"
},
"curator": {
"me": "mí",
"following": "personas que sigo",
"network": "mi red"
}
}
},
"sort": {
"title": "Ordenar",
Expand Down
24 changes: 22 additions & 2 deletions messages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1162,10 +1162,30 @@
},
"filters": {
"reach": {
"title": "Portee",
"title": "Publications de",
"all": "Tous",
"network": "Réseau",
"myNetwork": "Mon réseau",
"following": "Abonnements",
"friends": "Amis"
"friends": "Amis",
"me": "Moi",
"profileTag": "tag de profil",
"profileTagLimitReached": "{max} tags maximum",
"taggedBy": "par {reach}",
"taggedByLabel": "Choisissez qui a tagué ces profils",
"profileTagSummary": {
"reach": {
"all": "Publications de toute personne taguée comme {tags} par {curator}",
"friends": "Publications d’amis tagués comme {tags} par {curator}",
"following": "Publications de personnes que je suis taguées comme {tags} par {curator}",
"network": "Publications de personnes de mon réseau taguées comme {tags} par {curator}"
},
"curator": {
"me": "moi",
"following": "les personnes que je suis",
"network": "mon réseau"
}
}
},
"sort": {
"title": "Trier",
Expand Down
24 changes: 22 additions & 2 deletions messages/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -1162,10 +1162,30 @@
},
"filters": {
"reach": {
"title": "Portata",
"title": "Post di",
"all": "Tutti",
"network": "Rete",
"myNetwork": "La mia rete",
"following": "Seguiti",
"friends": "Amici"
"friends": "Amici",
"me": "Io",
"profileTag": "tag profilo",
"profileTagLimitReached": "massimo {max} tag",
"taggedBy": "da {reach}",
"taggedByLabel": "Scegli chi ha taggato questi profili",
"profileTagSummary": {
"reach": {
"all": "Post di chiunque sia stato taggato come {tags} da {curator}",
"friends": "Post di amici taggati come {tags} da {curator}",
"following": "Post di persone che seguo taggate come {tags} da {curator}",
"network": "Post di persone nella mia rete taggate come {tags} da {curator}"
},
"curator": {
"me": "me",
"following": "persone che seguo",
"network": "la mia rete"
}
}
},
"sort": {
"title": "Ordina",
Expand Down
24 changes: 22 additions & 2 deletions messages/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -1162,10 +1162,30 @@
},
"filters": {
"reach": {
"title": "範囲",
"title": "投稿元",
"all": "すべて",
"network": "ネットワーク",
"myNetwork": "自分のネットワーク",
"following": "フォロー中",
"friends": "友達"
"friends": "友達",
"me": "自分",
"profileTag": "プロフィールタグ",
"profileTagLimitReached": "最大{max}個のタグ",
"taggedBy": "{reach}による",
"taggedByLabel": "これらのプロフィールをタグ付けした範囲を選択",
"profileTagSummary": {
"reach": {
"all": "{curator}が {tags} とタグ付けした人の投稿",
"friends": "{curator}が {tags} とタグ付けした友達の投稿",
"following": "{curator}が {tags} とタグ付けしたフォロー中の人の投稿",
"network": "{curator}が {tags} とタグ付けした自分のネットワーク内の人の投稿"
},
"curator": {
"me": "私",
"following": "フォロー中の人",
"network": "自分のネットワーク"
}
}
},
"sort": {
"title": "並べ替え",
Expand Down
24 changes: 22 additions & 2 deletions messages/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -1162,10 +1162,30 @@
},
"filters": {
"reach": {
"title": "Alcance",
"title": "Posts de",
"all": "Todos",
"network": "Rede",
"myNetwork": "Minha rede",
"following": "Seguindo",
"friends": "Amigos"
"friends": "Amigos",
"me": "Eu",
"profileTag": "tag de perfil",
"profileTagLimitReached": "máximo de {max} tags",
"taggedBy": "por {reach}",
"taggedByLabel": "Escolha quem marcou estes perfis",
"profileTagSummary": {
"reach": {
"all": "Posts de qualquer pessoa marcada como {tags} por {curator}",
"friends": "Posts de amigos marcados como {tags} por {curator}",
"following": "Posts de pessoas que sigo marcadas como {tags} por {curator}",
"network": "Posts de pessoas da minha rede marcadas como {tags} por {curator}"
},
"curator": {
"me": "mim",
"following": "pessoas que sigo",
"network": "minha rede"
}
}
},
"sort": {
"title": "Ordenar",
Expand Down
24 changes: 22 additions & 2 deletions messages/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1156,10 +1156,30 @@
},
"filters": {
"reach": {
"title": "范围",
"title": "帖子来源",
"all": "全部",
"network": "网络",
"myNetwork": "我的网络",
"following": "关注",
"friends": "好友"
"friends": "好友",
"me": "我",
"profileTag": "个人资料标签",
"profileTagLimitReached": "最多 {max} 个标签",
"taggedBy": "由{reach}标记",
"taggedByLabel": "选择谁标记了这些个人资料",
"profileTagSummary": {
"reach": {
"all": "{curator}标记为 {tags} 的任何人的帖子",
"friends": "{curator}标记为 {tags} 的好友帖子",
"following": "{curator}标记为 {tags} 的我关注的人的帖子",
"network": "{curator}标记为 {tags} 的我网络中的人的帖子"
},
"curator": {
"me": "我",
"following": "我关注的人",
"network": "我的网络"
}
}
},
"sort": {
"title": "排序",
Expand Down
Loading
Loading